eliminate all 80-col violations that I have introduced in my recent checkins (and some others more)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80304 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Gabor Greif
2009-08-27 23:44:33 +00:00
parent b562b47dee
commit 7362ce08cb
14 changed files with 50 additions and 30 deletions

View File

@ -233,7 +233,8 @@ public:
return L1; return L1;
} }
class member_iterator : public std::iterator<std::forward_iterator_tag, ElemTy, ptrdiff_t> { class member_iterator : public std::iterator<std::forward_iterator_tag,
ElemTy, ptrdiff_t> {
typedef std::iterator<std::forward_iterator_tag, ElemTy, ptrdiff_t> super; typedef std::iterator<std::forward_iterator_tag, ElemTy, ptrdiff_t> super;
const ECValue *Node; const ECValue *Node;
friend class EquivalenceClasses; friend class EquivalenceClasses;

View File

@ -42,9 +42,11 @@ template<class GraphT,
class SetType = llvm::SmallPtrSet<typename GraphTraits<GraphT>::NodeType*, 8>, class SetType = llvm::SmallPtrSet<typename GraphTraits<GraphT>::NodeType*, 8>,
bool ExtStorage = false, bool ExtStorage = false,
class GT = GraphTraits<GraphT> > class GT = GraphTraits<GraphT> >
class po_iterator : public std::iterator<std::forward_iterator_tag, typename GT::NodeType, ptrdiff_t>, class po_iterator : public std::iterator<std::forward_iterator_tag,
typename GT::NodeType, ptrdiff_t>,
public po_iterator_storage<SetType, ExtStorage> { public po_iterator_storage<SetType, ExtStorage> {
typedef std::iterator<std::forward_iterator_tag, typename GT::NodeType, ptrdiff_t> super; typedef std::iterator<std::forward_iterator_tag,
typename GT::NodeType, ptrdiff_t> super;
typedef typename GT::NodeType NodeType; typedef typename GT::NodeType NodeType;
typedef typename GT::ChildIteratorType ChildItTy; typedef typename GT::ChildIteratorType ChildItTy;

View File

@ -34,11 +34,13 @@ namespace llvm {
/// ///
template<class GraphT, class GT = GraphTraits<GraphT> > template<class GraphT, class GT = GraphTraits<GraphT> >
class scc_iterator class scc_iterator
: public std::iterator<std::forward_iterator_tag, std::vector<typename GT::NodeType>, ptrdiff_t> { : public std::iterator<std::forward_iterator_tag,
std::vector<typename GT::NodeType>, ptrdiff_t> {
typedef typename GT::NodeType NodeType; typedef typename GT::NodeType NodeType;
typedef typename GT::ChildIteratorType ChildItTy; typedef typename GT::ChildIteratorType ChildItTy;
typedef std::vector<NodeType*> SccTy; typedef std::vector<NodeType*> SccTy;
typedef std::iterator<std::forward_iterator_tag, std::vector<typename GT::NodeType>, ptrdiff_t> super; typedef std::iterator<std::forward_iterator_tag,
std::vector<typename GT::NodeType>, ptrdiff_t> super;
typedef typename super::reference reference; typedef typename super::reference reference;
typedef typename super::pointer pointer; typedef typename super::pointer pointer;

View File

@ -144,7 +144,8 @@ class ilist_iterator
public: public:
typedef ilist_traits<NodeTy> Traits; typedef ilist_traits<NodeTy> Traits;
typedef std::iterator<std::bidirectional_iterator_tag, NodeTy, ptrdiff_t> super; typedef std::iterator<std::bidirectional_iterator_tag,
NodeTy, ptrdiff_t> super;
typedef typename super::value_type value_type; typedef typename super::value_type value_type;
typedef typename super::difference_type difference_type; typedef typename super::difference_type difference_type;

View File

@ -158,7 +158,8 @@ public:
void dump() const; void dump() const;
/// Define an iterator for alias sets... this is just a forward iterator. /// Define an iterator for alias sets... this is just a forward iterator.
class iterator : public std::iterator<std::forward_iterator_tag, PointerRec, ptrdiff_t> { class iterator : public std::iterator<std::forward_iterator_tag,
PointerRec, ptrdiff_t> {
PointerRec *CurNode; PointerRec *CurNode;
public: public:
explicit iterator(PointerRec *CN = 0) : CurNode(CN) {} explicit iterator(PointerRec *CN = 0) : CurNode(CN) {}

View File

@ -22,7 +22,8 @@ namespace llvm {
class Constant; class Constant;
class constant_iterator : public std::iterator<std::forward_iterator_tag, const Constant, ptrdiff_t> { class constant_iterator : public std::iterator<std::forward_iterator_tag,
const Constant, ptrdiff_t> {
const_inst_iterator InstI; // Method instruction iterator const_inst_iterator InstI; // Method instruction iterator
unsigned OpIdx; // Operand index unsigned OpIdx; // Operand index

View File

@ -233,7 +233,8 @@ private:
}; };
typedef IntervalIterator<BasicBlock, Function> function_interval_iterator; typedef IntervalIterator<BasicBlock, Function> function_interval_iterator;
typedef IntervalIterator<Interval, IntervalPartition> interval_part_interval_iterator; typedef IntervalIterator<Interval, IntervalPartition>
interval_part_interval_iterator;
inline function_interval_iterator intervals_begin(Function *F, inline function_interval_iterator intervals_begin(Function *F,

View File

@ -268,8 +268,10 @@ public:
} }
friend class MachineRegisterInfo; friend class MachineRegisterInfo;
public: public:
typedef std::iterator<std::forward_iterator_tag, MachineInstr, ptrdiff_t>::reference reference; typedef std::iterator<std::forward_iterator_tag,
typedef std::iterator<std::forward_iterator_tag, MachineInstr, ptrdiff_t>::pointer pointer; MachineInstr, ptrdiff_t>::reference reference;
typedef std::iterator<std::forward_iterator_tag,
MachineInstr, ptrdiff_t>::pointer pointer;
defusechain_iterator(const defusechain_iterator &I) : Op(I.Op) {} defusechain_iterator(const defusechain_iterator &I) : Op(I.Op) {}
defusechain_iterator() : Op(0) {} defusechain_iterator() : Op(0) {}

View File

@ -434,8 +434,8 @@ namespace llvm {
class ScheduleDAG { class ScheduleDAG {
public: public:
MachineBasicBlock *BB; // The block in which to insert instructions. MachineBasicBlock *BB; // The block in which to insert instructions
MachineBasicBlock::iterator InsertPos;// The position to insert instructions. MachineBasicBlock::iterator InsertPos;// The position to insert instructions
const TargetMachine &TM; // Target processor const TargetMachine &TM; // Target processor
const TargetInstrInfo *TII; // Target instruction information const TargetInstrInfo *TII; // Target instruction information
const TargetRegisterInfo *TRI; // Target processor register info const TargetRegisterInfo *TRI; // Target processor register info
@ -506,8 +506,8 @@ namespace llvm {
/// ///
virtual void Schedule() = 0; virtual void Schedule() = 0;
/// ForceUnitLatencies - Return true if all scheduling edges should be given a /// ForceUnitLatencies - Return true if all scheduling edges should be given
/// latency value of one. The default is to return false; schedulers may /// a latency value of one. The default is to return false; schedulers may
/// override this as needed. /// override this as needed.
virtual bool ForceUnitLatencies() const { return false; } virtual bool ForceUnitLatencies() const { return false; }
@ -535,7 +535,8 @@ namespace llvm {
void EmitLiveInCopies(MachineBasicBlock *MBB); void EmitLiveInCopies(MachineBasicBlock *MBB);
}; };
class SUnitIterator : public std::iterator<std::forward_iterator_tag, SUnit, ptrdiff_t> { class SUnitIterator : public std::iterator<std::forward_iterator_tag,
SUnit, ptrdiff_t> {
SUnit *Node; SUnit *Node;
unsigned Operand; unsigned Operand;
@ -547,7 +548,7 @@ namespace llvm {
bool operator!=(const SUnitIterator& x) const { return !operator==(x); } bool operator!=(const SUnitIterator& x) const { return !operator==(x); }
const SUnitIterator &operator=(const SUnitIterator &I) { const SUnitIterator &operator=(const SUnitIterator &I) {
assert(I.Node == Node && "Cannot assign iterators to two different nodes!"); assert(I.Node==Node && "Cannot assign iterators to two different nodes!");
Operand = I.Operand; Operand = I.Operand;
return *this; return *this;
} }

View File

@ -291,7 +291,7 @@ namespace ISD {
EXTRACT_SUBVECTOR, EXTRACT_SUBVECTOR,
/// VECTOR_SHUFFLE(VEC1, VEC2) - Returns a vector, of the same type as /// VECTOR_SHUFFLE(VEC1, VEC2) - Returns a vector, of the same type as
/// VEC1/VEC2. A VECTOR_SHUFFLE node also contains an array of constant int /// VEC1/VEC2. A VECTOR_SHUFFLE node also contains an array of constant int
/// values that indicate which value (or undef) each result element will /// values that indicate which value (or undef) each result element will
/// get. These constant ints are accessible through the /// get. These constant ints are accessible through the
/// ShuffleVectorSDNode class. This is quite similar to the Altivec /// ShuffleVectorSDNode class. This is quite similar to the Altivec
@ -1134,8 +1134,10 @@ public:
} }
friend class SDNode; friend class SDNode;
public: public:
typedef std::iterator<std::forward_iterator_tag, SDUse, ptrdiff_t>::reference reference; typedef std::iterator<std::forward_iterator_tag,
typedef std::iterator<std::forward_iterator_tag, SDUse, ptrdiff_t>::pointer pointer; SDUse, ptrdiff_t>::reference reference;
typedef std::iterator<std::forward_iterator_tag,
SDUse, ptrdiff_t>::pointer pointer;
use_iterator(const use_iterator &I) : Op(I.Op) {} use_iterator(const use_iterator &I) : Op(I.Op) {}
use_iterator() : Op(0) {} use_iterator() : Op(0) {}
@ -2353,7 +2355,8 @@ public:
}; };
class SDNodeIterator : public std::iterator<std::forward_iterator_tag, SDNode, ptrdiff_t> { class SDNodeIterator : public std::iterator<std::forward_iterator_tag,
SDNode, ptrdiff_t> {
SDNode *Node; SDNode *Node;
unsigned Operand; unsigned Operand;

View File

@ -241,7 +241,8 @@ namespace llvmc {
/// NodeChildIterator - Another auxiliary class needed by GraphTraits. /// NodeChildIterator - Another auxiliary class needed by GraphTraits.
class NodeChildIterator : public std::iterator<std::bidirectional_iterator_tag, Node, ptrdiff_t> { class NodeChildIterator : public
std::iterator<std::bidirectional_iterator_tag, Node, ptrdiff_t> {
typedef NodeChildIterator ThisType; typedef NodeChildIterator ThisType;
typedef Node::container_type::iterator iterator; typedef Node::container_type::iterator iterator;

View File

@ -21,12 +21,13 @@
namespace llvm { namespace llvm {
//===--------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// BasicBlock pred_iterator definition // BasicBlock pred_iterator definition
//===--------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
template <class _Ptr, class _USE_iterator> // Predecessor Iterator template <class _Ptr, class _USE_iterator> // Predecessor Iterator
class PredIterator : public std::iterator<std::forward_iterator_tag, _Ptr, ptrdiff_t> { class PredIterator : public std::iterator<std::forward_iterator_tag,
_Ptr, ptrdiff_t> {
typedef std::iterator<std::forward_iterator_tag, _Ptr, ptrdiff_t> super; typedef std::iterator<std::forward_iterator_tag, _Ptr, ptrdiff_t> super;
_USE_iterator It; _USE_iterator It;
public: public:
@ -79,12 +80,13 @@ inline pred_const_iterator pred_end(const BasicBlock *BB) {
//===--------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// BasicBlock succ_iterator definition // BasicBlock succ_iterator definition
//===--------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
template <class Term_, class BB_> // Successor Iterator template <class Term_, class BB_> // Successor Iterator
class SuccIterator : public std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> { class SuccIterator : public std::iterator<std::bidirectional_iterator_tag,
BB_, ptrdiff_t> {
const Term_ Term; const Term_ Term;
unsigned idx; unsigned idx;
typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> super; typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> super;

View File

@ -22,7 +22,8 @@ namespace llvm {
template<typename ItTy = User::const_op_iterator> template<typename ItTy = User::const_op_iterator>
class generic_gep_type_iterator class generic_gep_type_iterator
: public std::iterator<std::forward_iterator_tag, const Type *, ptrdiff_t> { : public std::iterator<std::forward_iterator_tag, const Type *, ptrdiff_t> {
typedef std::iterator<std::forward_iterator_tag, const Type *, ptrdiff_t> super; typedef std::iterator<std::forward_iterator_tag,
const Type *, ptrdiff_t> super;
ItTy OpIt; ItTy OpIt;
const Type *CurTy; const Type *CurTy;

View File

@ -158,7 +158,8 @@ template<> struct simplify_type<const Use> {
template<typename UserTy> // UserTy == 'User' or 'const User' template<typename UserTy> // UserTy == 'User' or 'const User'
class value_use_iterator : public std::iterator<std::forward_iterator_tag, UserTy*, ptrdiff_t> { class value_use_iterator : public std::iterator<std::forward_iterator_tag,
UserTy*, ptrdiff_t> {
typedef std::iterator<std::forward_iterator_tag, UserTy*, ptrdiff_t> super; typedef std::iterator<std::forward_iterator_tag, UserTy*, ptrdiff_t> super;
typedef value_use_iterator<UserTy> _Self; typedef value_use_iterator<UserTy> _Self;