From 0d4f0852328b763b2b4f96ce705f9a9c95e402a1 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Thu, 27 Aug 2009 23:44:33 +0000 Subject: [PATCH] eliminate all 80-col violations that I have introduced in my recent checkins (and some others more) llvm-svn: 80304 --- include/llvm/ADT/EquivalenceClasses.h | 3 ++- include/llvm/ADT/PostOrderIterator.h | 6 ++++-- include/llvm/ADT/SCCIterator.h | 6 ++++-- include/llvm/ADT/ilist.h | 3 ++- include/llvm/Analysis/AliasSetTracker.h | 3 ++- include/llvm/Analysis/ConstantsScanner.h | 3 ++- include/llvm/Analysis/IntervalIterator.h | 3 ++- include/llvm/CodeGen/MachineRegisterInfo.h | 6 ++++-- include/llvm/CodeGen/ScheduleDAG.h | 13 +++++++------ include/llvm/CodeGen/SelectionDAGNodes.h | 11 +++++++---- include/llvm/CompilerDriver/CompilationGraph.h | 3 ++- include/llvm/Support/CFG.h | 14 ++++++++------ include/llvm/Support/GetElementPtrTypeIterator.h | 3 ++- 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 766d0c8a781..bed99d3d205 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 { + class member_iterator : public std::iterator { typedef std::iterator super; const ECValue *Node; friend class EquivalenceClasses; diff --git a/include/llvm/ADT/PostOrderIterator.h b/include/llvm/ADT/PostOrderIterator.h index 5760b2b552c..8315bc9f9ed 100644 --- a/include/llvm/ADT/PostOrderIterator.h +++ b/include/llvm/ADT/PostOrderIterator.h @@ -42,9 +42,11 @@ template::NodeType*, 8>, bool ExtStorage = false, class GT = GraphTraits > -class po_iterator : public std::iterator, +class po_iterator : public std::iterator, public po_iterator_storage { - typedef std::iterator super; + typedef std::iterator 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 9ca0f1c00e7..c0c6ba2a63d 100644 --- a/include/llvm/ADT/SCCIterator.h +++ b/include/llvm/ADT/SCCIterator.h @@ -34,11 +34,13 @@ namespace llvm { /// template > class scc_iterator - : public std::iterator, ptrdiff_t> { + : public std::iterator, ptrdiff_t> { typedef typename GT::NodeType NodeType; typedef typename GT::ChildIteratorType ChildItTy; typedef std::vector SccTy; - typedef std::iterator, ptrdiff_t> super; + typedef std::iterator, 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 4560f55e52f..6e6f5d69b68 100644 --- a/include/llvm/ADT/ilist.h +++ b/include/llvm/ADT/ilist.h @@ -144,7 +144,8 @@ class ilist_iterator public: typedef ilist_traits Traits; - typedef std::iterator super; + typedef std::iterator 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 793da6f6bca..239f30f9384 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 { + class iterator : public std::iterator { 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 6fc110a8065..cdaf68d75a6 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 { +class constant_iterator : public std::iterator { 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 551bb724379..d842840b66b 100644 --- a/include/llvm/Analysis/IntervalIterator.h +++ b/include/llvm/Analysis/IntervalIterator.h @@ -233,7 +233,8 @@ private: }; typedef IntervalIterator function_interval_iterator; -typedef IntervalIterator interval_part_interval_iterator; +typedef IntervalIterator + 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 0d82f4ece7c..18e60200b09 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::reference reference; - typedef std::iterator::pointer pointer; + typedef std::iterator::reference reference; + typedef std::iterator::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 797c9bce95b..af309486a65 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 { + class SUnitIterator : public std::iterator { 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 af8c833ac11..161642fbac6 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::reference reference; - typedef std::iterator::pointer pointer; + typedef std::iterator::reference reference; + typedef std::iterator::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 { +class SDNodeIterator : public std::iterator { SDNode *Node; unsigned Operand; diff --git a/include/llvm/CompilerDriver/CompilationGraph.h b/include/llvm/CompilerDriver/CompilationGraph.h index 2579b2630b0..3daafd58a7c 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 { + class NodeChildIterator : public + std::iterator { typedef NodeChildIterator ThisType; typedef Node::container_type::iterator iterator; diff --git a/include/llvm/Support/CFG.h b/include/llvm/Support/CFG.h index ca181c519cf..3a20696f05a 100644 --- a/include/llvm/Support/CFG.h +++ b/include/llvm/Support/CFG.h @@ -21,12 +21,13 @@ namespace llvm { -//===--------------------------------------------------------------------===// +//===----------------------------------------------------------------------===// // BasicBlock pred_iterator definition -//===--------------------------------------------------------------------===// +//===----------------------------------------------------------------------===// template // Predecessor Iterator -class PredIterator : public std::iterator { +class PredIterator : public std::iterator { typedef std::iterator super; _USE_iterator It; public: @@ -79,12 +80,13 @@ inline pred_const_iterator pred_end(const BasicBlock *BB) { -//===--------------------------------------------------------------------===// +//===----------------------------------------------------------------------===// // BasicBlock succ_iterator definition -//===--------------------------------------------------------------------===// +//===----------------------------------------------------------------------===// template // Successor Iterator -class SuccIterator : public std::iterator { +class SuccIterator : public std::iterator { const Term_ Term; unsigned idx; typedef std::iterator super; diff --git a/include/llvm/Support/GetElementPtrTypeIterator.h b/include/llvm/Support/GetElementPtrTypeIterator.h index 9430477f075..f5915c992cd 100644 --- a/include/llvm/Support/GetElementPtrTypeIterator.h +++ b/include/llvm/Support/GetElementPtrTypeIterator.h @@ -22,7 +22,8 @@ namespace llvm { template class generic_gep_type_iterator : public std::iterator { - typedef std::iterator super; + typedef std::iterator super; ItTy OpIt; const Type *CurTy; diff --git a/include/llvm/Use.h b/include/llvm/Use.h index 00b9c437fbb..970f69b9da8 100644 --- a/include/llvm/Use.h +++ b/include/llvm/Use.h @@ -158,7 +158,8 @@ template<> struct simplify_type { template // UserTy == 'User' or 'const User' -class value_use_iterator : public std::iterator { +class value_use_iterator : public std::iterator { typedef std::iterator super; typedef value_use_iterator _Self;