From a2769a33c94f021a609a462b28ebea069eba6f74 Mon Sep 17 00:00:00 2001 From: Misha Brukman Date: Fri, 20 Feb 2009 22:20:18 +0000 Subject: [PATCH] Fixed lint errors: * Alphabetized #includes * Removed trailing whitespace * Wrapped or shortened lines over 80 chars git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@65181 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/APInt.h | 3 ++- include/llvm/ADT/DepthFirstIterator.h | 2 +- include/llvm/ADT/GraphTraits.h | 4 ++-- include/llvm/ADT/ImmutableMap.h | 4 ++-- include/llvm/ADT/IndexedMap.h | 2 +- include/llvm/ADT/IntrusiveRefCntPtr.h | 2 +- include/llvm/ADT/OwningPtr.h | 2 +- include/llvm/ADT/PostOrderIterator.h | 5 +++-- include/llvm/ADT/SCCIterator.h | 2 +- include/llvm/ADT/STLExtras.h | 2 +- include/llvm/ADT/SetVector.h | 4 ++-- include/llvm/ADT/SmallVector.h | 2 +- include/llvm/ADT/Tree.h | 8 ++++---- include/llvm/ADT/Trie.h | 8 ++++++-- include/llvm/ADT/ilist.h | 3 ++- 15 files changed, 30 insertions(+), 23 deletions(-) diff --git a/include/llvm/ADT/APInt.h b/include/llvm/ADT/APInt.h index 3bbd5278e96..a309d7f9954 100644 --- a/include/llvm/ADT/APInt.h +++ b/include/llvm/ADT/APInt.h @@ -1275,7 +1275,8 @@ public: /// srcLSB, to DST, of dstCOUNT parts, such that the bit srcLSB /// becomes the least significant bit of DST. All high bits above /// srcBITS in DST are zero-filled. - static void tcExtract(integerPart *, unsigned int dstCount, const integerPart *, + static void tcExtract(integerPart *, unsigned int dstCount, + const integerPart *, unsigned int srcBits, unsigned int srcLSB); /// Set the given bit of a bignum. Zero-based. diff --git a/include/llvm/ADT/DepthFirstIterator.h b/include/llvm/ADT/DepthFirstIterator.h index 28c18856765..b00f585d86f 100644 --- a/include/llvm/ADT/DepthFirstIterator.h +++ b/include/llvm/ADT/DepthFirstIterator.h @@ -36,8 +36,8 @@ #include "llvm/ADT/GraphTraits.h" #include "llvm/ADT/iterator.h" #include "llvm/ADT/SmallPtrSet.h" -#include #include +#include namespace llvm { diff --git a/include/llvm/ADT/GraphTraits.h b/include/llvm/ADT/GraphTraits.h index 35da5ab2f8e..2d103cf83eb 100644 --- a/include/llvm/ADT/GraphTraits.h +++ b/include/llvm/ADT/GraphTraits.h @@ -78,8 +78,8 @@ struct Inverse { inline Inverse(const GraphType &G) : Graph(G) {} }; -// Provide a partial specialization of GraphTraits so that the inverse of an inverse -// falls back to the original graph. +// Provide a partial specialization of GraphTraits so that the inverse of an +// inverse falls back to the original graph. template struct GraphTraits > > { typedef typename GraphTraits::NodeType NodeType; diff --git a/include/llvm/ADT/ImmutableMap.h b/include/llvm/ADT/ImmutableMap.h index 1b1014ea46b..07cdb56a9ab 100644 --- a/include/llvm/ADT/ImmutableMap.h +++ b/include/llvm/ADT/ImmutableMap.h @@ -18,8 +18,8 @@ namespace llvm { -/// ImutKeyValueInfo -Traits class used by ImmutableMap. While both the first and -/// second elements in a pair are used to generate profile information, +/// ImutKeyValueInfo -Traits class used by ImmutableMap. While both the first +/// and second elements in a pair are used to generate profile information, /// only the first element (the key) is used by isEqual and isLess. template struct ImutKeyValueInfo { diff --git a/include/llvm/ADT/IndexedMap.h b/include/llvm/ADT/IndexedMap.h index ad95bdba018..ff5d3a139c7 100644 --- a/include/llvm/ADT/IndexedMap.h +++ b/include/llvm/ADT/IndexedMap.h @@ -20,9 +20,9 @@ #ifndef LLVM_ADT_INDEXEDMAP_H #define LLVM_ADT_INDEXEDMAP_H +#include #include #include -#include namespace llvm { diff --git a/include/llvm/ADT/IntrusiveRefCntPtr.h b/include/llvm/ADT/IntrusiveRefCntPtr.h index ad2138b10e0..37d4ac9d29d 100644 --- a/include/llvm/ADT/IntrusiveRefCntPtr.h +++ b/include/llvm/ADT/IntrusiveRefCntPtr.h @@ -1,4 +1,4 @@ -//== llvm/ADT/IntrusiveRefCntPtr.h - Smart Refcounting Pointer ----*- C++ -*-==// +//== llvm/ADT/IntrusiveRefCntPtr.h - Smart Refcounting Pointer ---*- C++ -*-==// // // The LLVM Compiler Infrastructure // diff --git a/include/llvm/ADT/OwningPtr.h b/include/llvm/ADT/OwningPtr.h index 89dc19ca05b..cc53c8c30c1 100644 --- a/include/llvm/ADT/OwningPtr.h +++ b/include/llvm/ADT/OwningPtr.h @@ -26,7 +26,7 @@ namespace llvm { template class OwningPtr { OwningPtr(OwningPtr const &); // DO NOT IMPLEMENT - OwningPtr &operator=(OwningPtr const &); // DO NOT IMPLEMENT + OwningPtr &operator=(OwningPtr const &); // DO NOT IMPLEMENT T *Ptr; public: explicit OwningPtr(T *P = 0) : Ptr(P) {} diff --git a/include/llvm/ADT/PostOrderIterator.h b/include/llvm/ADT/PostOrderIterator.h index eb556b5ec3b..bf7ce9d0bb6 100644 --- a/include/llvm/ADT/PostOrderIterator.h +++ b/include/llvm/ADT/PostOrderIterator.h @@ -18,8 +18,8 @@ #include "llvm/ADT/GraphTraits.h" #include "llvm/ADT/iterator.h" -#include #include +#include #include namespace llvm { @@ -165,7 +165,8 @@ ipo_iterator ipo_end(T G){ } //Provide global definitions of external inverse postorder iterators... -template ::NodeType*> > +template ::NodeType*> > struct ipo_ext_iterator : public ipo_iterator { ipo_ext_iterator(const ipo_iterator &V) : ipo_iterator(&V) {} diff --git a/include/llvm/ADT/SCCIterator.h b/include/llvm/ADT/SCCIterator.h index ab5e2f4fc3e..e28f4caa5d7 100644 --- a/include/llvm/ADT/SCCIterator.h +++ b/include/llvm/ADT/SCCIterator.h @@ -23,8 +23,8 @@ #include "llvm/ADT/GraphTraits.h" #include "llvm/ADT/iterator.h" -#include #include +#include namespace llvm { diff --git a/include/llvm/ADT/STLExtras.h b/include/llvm/ADT/STLExtras.h index 81afd9da4e9..964e7e07ef7 100644 --- a/include/llvm/ADT/STLExtras.h +++ b/include/llvm/ADT/STLExtras.h @@ -17,9 +17,9 @@ #ifndef LLVM_ADT_STLEXTRAS_H #define LLVM_ADT_STLEXTRAS_H +#include // for std::size_t #include #include // for std::pair -#include // for std::size_t #include "llvm/ADT/iterator.h" namespace llvm { diff --git a/include/llvm/ADT/SetVector.h b/include/llvm/ADT/SetVector.h index 2671bc5c9e2..fab133af4c0 100644 --- a/include/llvm/ADT/SetVector.h +++ b/include/llvm/ADT/SetVector.h @@ -21,9 +21,9 @@ #define LLVM_ADT_SETVECTOR_H #include "llvm/ADT/SmallSet.h" -#include -#include #include +#include +#include namespace llvm { diff --git a/include/llvm/ADT/SmallVector.h b/include/llvm/ADT/SmallVector.h index c981d5756b3..da91a65ea47 100644 --- a/include/llvm/ADT/SmallVector.h +++ b/include/llvm/ADT/SmallVector.h @@ -17,9 +17,9 @@ #include "llvm/ADT/iterator.h" #include "llvm/Support/type_traits.h" #include +#include #include #include -#include #ifdef _MSC_VER namespace std { diff --git a/include/llvm/ADT/Tree.h b/include/llvm/ADT/Tree.h index 6b3751fe6e5..78f5b4fab97 100644 --- a/include/llvm/ADT/Tree.h +++ b/include/llvm/ADT/Tree.h @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// // -// This class defines a generic N way tree node structure. The tree structure +// This class defines a generic N-way tree node structure. The tree structure // is immutable after creation, but the payload contained within it is not. // //===----------------------------------------------------------------------===// @@ -21,9 +21,9 @@ namespace llvm { template class Tree { - std::vector Children; // This nodes children, if any - ConcreteTreeNode *Parent; // Parent of this node... - Payload Data; // Data held in this node... + std::vector Children; // This node's children, if any. + ConcreteTreeNode *Parent; // Parent of this node. + Payload Data; // Data held in this node. protected: void setChildren(const std::vector &children) { diff --git a/include/llvm/ADT/Trie.h b/include/llvm/ADT/Trie.h index 8a868e53c11..70f3b4154d3 100644 --- a/include/llvm/ADT/Trie.h +++ b/include/llvm/ADT/Trie.h @@ -279,9 +279,13 @@ struct GraphTraits > { typedef typename TrieType::Node NodeType; typedef typename NodeType::iterator ChildIteratorType; - static inline NodeType *getEntryNode(const TrieType& T) { return T.getRoot(); } + static inline NodeType *getEntryNode(const TrieType& T) { + return T.getRoot(); + } - static inline ChildIteratorType child_begin(NodeType *N) { return N->begin(); } + static inline ChildIteratorType child_begin(NodeType *N) { + return N->begin(); + } static inline ChildIteratorType child_end(NodeType *N) { return N->end(); } typedef typename std::vector::const_iterator nodes_iterator; diff --git a/include/llvm/ADT/ilist.h b/include/llvm/ADT/ilist.h index cf9c9c7464d..6bfc10009d1 100644 --- a/include/llvm/ADT/ilist.h +++ b/include/llvm/ADT/ilist.h @@ -370,7 +370,8 @@ public: } iterator insert(iterator where, NodeTy *New) { - NodeTy *CurNode = where.getNodePtrUnchecked(), *PrevNode = this->getPrev(CurNode); + NodeTy *CurNode = where.getNodePtrUnchecked(); + NodeTy *PrevNode = this->getPrev(CurNode); this->setNext(New, CurNode); this->setPrev(New, PrevNode); -- 2.34.1