diff options
author | Gabor Greif <ggreif@gmail.com> | 2009-08-27 23:44:33 +0000 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2009-08-27 23:44:33 +0000 |
commit | 7362ce08cb2c1f0b544b18dbc21630fb4baebcfc (patch) | |
tree | ab562add7fce10ca928554df16111b6e8fd1844b | |
parent | b562b47deeb163d3c854b2d9670bf38a37b7816e (diff) | |
download | external_llvm-7362ce08cb2c1f0b544b18dbc21630fb4baebcfc.zip external_llvm-7362ce08cb2c1f0b544b18dbc21630fb4baebcfc.tar.gz external_llvm-7362ce08cb2c1f0b544b18dbc21630fb4baebcfc.tar.bz2 |
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
-rw-r--r-- | include/llvm/ADT/EquivalenceClasses.h | 3 | ||||
-rw-r--r-- | include/llvm/ADT/PostOrderIterator.h | 6 | ||||
-rw-r--r-- | include/llvm/ADT/SCCIterator.h | 6 | ||||
-rw-r--r-- | include/llvm/ADT/ilist.h | 3 | ||||
-rw-r--r-- | include/llvm/Analysis/AliasSetTracker.h | 3 | ||||
-rw-r--r-- | include/llvm/Analysis/ConstantsScanner.h | 3 | ||||
-rw-r--r-- | include/llvm/Analysis/IntervalIterator.h | 3 | ||||
-rw-r--r-- | include/llvm/CodeGen/MachineRegisterInfo.h | 6 | ||||
-rw-r--r-- | include/llvm/CodeGen/ScheduleDAG.h | 13 | ||||
-rw-r--r-- | include/llvm/CodeGen/SelectionDAGNodes.h | 11 | ||||
-rw-r--r-- | include/llvm/CompilerDriver/CompilationGraph.h | 3 | ||||
-rw-r--r-- | include/llvm/Support/CFG.h | 14 | ||||
-rw-r--r-- | include/llvm/Support/GetElementPtrTypeIterator.h | 3 | ||||
-rw-r--r-- | include/llvm/Use.h | 3 |
14 files changed, 50 insertions, 30 deletions
diff --git a/include/llvm/ADT/EquivalenceClasses.h b/include/llvm/ADT/EquivalenceClasses.h index 766d0c8..bed99d3 100644 --- a/include/llvm/ADT/EquivalenceClasses.h +++ b/include/llvm/ADT/EquivalenceClasses.h @@ -233,7 +233,8 @@ public: 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; const ECValue *Node; friend class EquivalenceClasses; diff --git a/include/llvm/ADT/PostOrderIterator.h b/include/llvm/ADT/PostOrderIterator.h index 5760b2b..8315bc9 100644 --- a/include/llvm/ADT/PostOrderIterator.h +++ b/include/llvm/ADT/PostOrderIterator.h @@ -42,9 +42,11 @@ template<class GraphT, class SetType = llvm::SmallPtrSet<typename GraphTraits<GraphT>::NodeType*, 8>, bool ExtStorage = false, 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> { - 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::ChildIteratorType ChildItTy; diff --git a/include/llvm/ADT/SCCIterator.h b/include/llvm/ADT/SCCIterator.h index 9ca0f1c..c0c6ba2 100644 --- a/include/llvm/ADT/SCCIterator.h +++ b/include/llvm/ADT/SCCIterator.h @@ -34,11 +34,13 @@ namespace llvm { /// template<class GraphT, class GT = GraphTraits<GraphT> > 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::ChildIteratorType ChildItTy; 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::pointer pointer; diff --git a/include/llvm/ADT/ilist.h b/include/llvm/ADT/ilist.h index 4560f55..6e6f5d6 100644 --- a/include/llvm/ADT/ilist.h +++ b/include/llvm/ADT/ilist.h @@ -144,7 +144,8 @@ class ilist_iterator public: 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::difference_type difference_type; diff --git a/include/llvm/Analysis/AliasSetTracker.h b/include/llvm/Analysis/AliasSetTracker.h index 793da6f..239f30f 100644 --- a/include/llvm/Analysis/AliasSetTracker.h +++ b/include/llvm/Analysis/AliasSetTracker.h @@ -158,7 +158,8 @@ public: void dump() const; /// 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; public: explicit iterator(PointerRec *CN = 0) : CurNode(CN) {} diff --git a/include/llvm/Analysis/ConstantsScanner.h b/include/llvm/Analysis/ConstantsScanner.h index 6fc110a..cdaf68d 100644 --- a/include/llvm/Analysis/ConstantsScanner.h +++ b/include/llvm/Analysis/ConstantsScanner.h @@ -22,7 +22,8 @@ namespace llvm { 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 unsigned OpIdx; // Operand index diff --git a/include/llvm/Analysis/IntervalIterator.h b/include/llvm/Analysis/IntervalIterator.h index 551bb72..d842840 100644 --- a/include/llvm/Analysis/IntervalIterator.h +++ b/include/llvm/Analysis/IntervalIterator.h @@ -233,7 +233,8 @@ private: }; 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, diff --git a/include/llvm/CodeGen/MachineRegisterInfo.h b/include/llvm/CodeGen/MachineRegisterInfo.h index 0d82f4e..18e6020 100644 --- a/include/llvm/CodeGen/MachineRegisterInfo.h +++ b/include/llvm/CodeGen/MachineRegisterInfo.h @@ -268,8 +268,10 @@ public: } friend class MachineRegisterInfo; public: - typedef std::iterator<std::forward_iterator_tag, MachineInstr, ptrdiff_t>::reference reference; - typedef std::iterator<std::forward_iterator_tag, MachineInstr, ptrdiff_t>::pointer pointer; + typedef std::iterator<std::forward_iterator_tag, + 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() : Op(0) {} diff --git a/include/llvm/CodeGen/ScheduleDAG.h b/include/llvm/CodeGen/ScheduleDAG.h index 797c9bc..af30948 100644 --- a/include/llvm/CodeGen/ScheduleDAG.h +++ b/include/llvm/CodeGen/ScheduleDAG.h @@ -434,8 +434,8 @@ namespace llvm { class ScheduleDAG { public: - MachineBasicBlock *BB; // The block in which to insert instructions. - MachineBasicBlock::iterator InsertPos;// The position to insert instructions. + MachineBasicBlock *BB; // The block in which to insert instructions + MachineBasicBlock::iterator InsertPos;// The position to insert instructions const TargetMachine &TM; // Target processor const TargetInstrInfo *TII; // Target instruction information const TargetRegisterInfo *TRI; // Target processor register info @@ -506,8 +506,8 @@ namespace llvm { /// virtual void Schedule() = 0; - /// ForceUnitLatencies - Return true if all scheduling edges should be given a - /// latency value of one. The default is to return false; schedulers may + /// ForceUnitLatencies - Return true if all scheduling edges should be given + /// a latency value of one. The default is to return false; schedulers may /// override this as needed. virtual bool ForceUnitLatencies() const { return false; } @@ -535,7 +535,8 @@ namespace llvm { 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; unsigned Operand; @@ -547,7 +548,7 @@ namespace llvm { bool operator!=(const SUnitIterator& x) const { return !operator==(x); } 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; return *this; } diff --git a/include/llvm/CodeGen/SelectionDAGNodes.h b/include/llvm/CodeGen/SelectionDAGNodes.h index af8c833..161642f 100644 --- a/include/llvm/CodeGen/SelectionDAGNodes.h +++ b/include/llvm/CodeGen/SelectionDAGNodes.h @@ -291,7 +291,7 @@ namespace ISD { EXTRACT_SUBVECTOR, /// 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 /// get. These constant ints are accessible through the /// ShuffleVectorSDNode class. This is quite similar to the Altivec @@ -1134,8 +1134,10 @@ public: } friend class SDNode; public: - typedef std::iterator<std::forward_iterator_tag, SDUse, ptrdiff_t>::reference reference; - typedef std::iterator<std::forward_iterator_tag, SDUse, ptrdiff_t>::pointer pointer; + typedef std::iterator<std::forward_iterator_tag, + 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() : 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; unsigned Operand; diff --git a/include/llvm/CompilerDriver/CompilationGraph.h b/include/llvm/CompilerDriver/CompilationGraph.h index 2579b26..3daafd5 100644 --- a/include/llvm/CompilerDriver/CompilationGraph.h +++ b/include/llvm/CompilerDriver/CompilationGraph.h @@ -241,7 +241,8 @@ namespace llvmc { /// 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 Node::container_type::iterator iterator; diff --git a/include/llvm/Support/CFG.h b/include/llvm/Support/CFG.h index ca181c5..3a20696 100644 --- a/include/llvm/Support/CFG.h +++ b/include/llvm/Support/CFG.h @@ -21,12 +21,13 @@ namespace llvm { -//===--------------------------------------------------------------------===// +//===----------------------------------------------------------------------===// // BasicBlock pred_iterator definition -//===--------------------------------------------------------------------===// +//===----------------------------------------------------------------------===// 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; _USE_iterator It; public: @@ -79,12 +80,13 @@ inline pred_const_iterator pred_end(const BasicBlock *BB) { -//===--------------------------------------------------------------------===// +//===----------------------------------------------------------------------===// // BasicBlock succ_iterator definition -//===--------------------------------------------------------------------===// +//===----------------------------------------------------------------------===// 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; unsigned idx; typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> super; diff --git a/include/llvm/Support/GetElementPtrTypeIterator.h b/include/llvm/Support/GetElementPtrTypeIterator.h index 9430477..f5915c9 100644 --- a/include/llvm/Support/GetElementPtrTypeIterator.h +++ b/include/llvm/Support/GetElementPtrTypeIterator.h @@ -22,7 +22,8 @@ namespace llvm { template<typename ItTy = User::const_op_iterator> class generic_gep_type_iterator : 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; const Type *CurTy; diff --git a/include/llvm/Use.h b/include/llvm/Use.h index 00b9c43..970f69b 100644 --- a/include/llvm/Use.h +++ b/include/llvm/Use.h @@ -158,7 +158,8 @@ template<> struct simplify_type<const Use> { 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 value_use_iterator<UserTy> _Self; |