From 2d834ba1950fb6fc8ede32e070f4dec90b3e148b Mon Sep 17 00:00:00 2001 From: Tim Shen Date: Wed, 31 Aug 2016 16:48:13 +0000 Subject: [PATCH] s/static inline/static/ for headers I have changed in r279475. NFC. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@280257 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/StmtGraphTraits.h | 8 +++--- include/clang/Analysis/Analyses/Dominators.h | 4 +-- include/clang/Analysis/CFG.h | 24 ++++++---------- .../Core/PathSensitive/ExplodedGraph.h | 28 +++++++------------ 4 files changed, 24 insertions(+), 40 deletions(-) diff --git a/include/clang/AST/StmtGraphTraits.h b/include/clang/AST/StmtGraphTraits.h index 11084be40c..92eb64430f 100644 --- a/include/clang/AST/StmtGraphTraits.h +++ b/include/clang/AST/StmtGraphTraits.h @@ -31,12 +31,12 @@ template <> struct GraphTraits { static NodeRef getEntryNode(clang::Stmt *S) { return S; } - static inline ChildIteratorType child_begin(NodeRef N) { + static ChildIteratorType child_begin(NodeRef N) { if (N) return N->child_begin(); else return ChildIteratorType(); } - static inline ChildIteratorType child_end(NodeRef N) { + static ChildIteratorType child_end(NodeRef N) { if (N) return N->child_end(); else return ChildIteratorType(); } @@ -58,12 +58,12 @@ template <> struct GraphTraits { static NodeRef getEntryNode(const clang::Stmt *S) { return S; } - static inline ChildIteratorType child_begin(NodeRef N) { + static ChildIteratorType child_begin(NodeRef N) { if (N) return N->child_begin(); else return ChildIteratorType(); } - static inline ChildIteratorType child_end(NodeRef N) { + static ChildIteratorType child_end(NodeRef N) { if (N) return N->child_end(); else return ChildIteratorType(); } diff --git a/include/clang/Analysis/Analyses/Dominators.h b/include/clang/Analysis/Analyses/Dominators.h index 3e625d2102..1229f8a8ef 100644 --- a/include/clang/Analysis/Analyses/Dominators.h +++ b/include/clang/Analysis/Analyses/Dominators.h @@ -171,8 +171,8 @@ template <> struct GraphTraits< ::clang::DomTreeNode* > { typedef ::clang::DomTreeNode::iterator ChildIteratorType; static NodeRef getEntryNode(NodeRef N) { return N; } - static inline ChildIteratorType child_begin(NodeRef N) { return N->begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->end(); } typedef llvm::pointer_iterator> nodes_iterator; diff --git a/include/clang/Analysis/CFG.h b/include/clang/Analysis/CFG.h index 36201b052f..6ee6ce10dd 100644 --- a/include/clang/Analysis/CFG.h +++ b/include/clang/Analysis/CFG.h @@ -950,11 +950,9 @@ template <> struct GraphTraits< ::clang::CFGBlock *> { static NodeRef getEntryNode(::clang::CFGBlock *BB) { return BB; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->succ_begin(); - } + static ChildIteratorType child_begin(NodeRef N) { return N->succ_begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } + static ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } }; template <> struct GraphTraits< const ::clang::CFGBlock *> { @@ -963,11 +961,9 @@ template <> struct GraphTraits< const ::clang::CFGBlock *> { static NodeRef getEntryNode(const clang::CFGBlock *BB) { return BB; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->succ_begin(); - } + static ChildIteratorType child_begin(NodeRef N) { return N->succ_begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } + static ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } }; template <> struct GraphTraits > { @@ -978,11 +974,9 @@ template <> struct GraphTraits > { return G.Graph; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->pred_begin(); - } + static ChildIteratorType child_begin(NodeRef N) { return N->pred_begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->pred_end(); } + static ChildIteratorType child_end(NodeRef N) { return N->pred_end(); } }; template <> struct GraphTraits > { @@ -993,11 +987,9 @@ template <> struct GraphTraits > { return G.Graph; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->pred_begin(); - } + static ChildIteratorType child_begin(NodeRef N) { return N->pred_begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->pred_end(); } + static ChildIteratorType child_end(NodeRef N) { return N->pred_end(); } }; // Traits for: CFG diff --git a/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h b/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h index 48feef413e..a710ae68be 100644 --- a/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h +++ b/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h @@ -454,19 +454,15 @@ namespace llvm { typedef clang::ento::ExplodedNode::succ_iterator ChildIteratorType; typedef llvm::df_iterator nodes_iterator; - static inline NodeRef getEntryNode(NodeRef N) { return N; } + static NodeRef getEntryNode(NodeRef N) { return N; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->succ_begin(); - } + static ChildIteratorType child_begin(NodeRef N) { return N->succ_begin(); } - static inline ChildIteratorType child_end(NodeRef N) { - return N->succ_end(); - } + static ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } - static inline nodes_iterator nodes_begin(NodeRef N) { return df_begin(N); } + static nodes_iterator nodes_begin(NodeRef N) { return df_begin(N); } - static inline nodes_iterator nodes_end(NodeRef N) { return df_end(N); } + static nodes_iterator nodes_end(NodeRef N) { return df_end(N); } }; template<> struct GraphTraits { @@ -474,19 +470,15 @@ namespace llvm { typedef clang::ento::ExplodedNode::const_succ_iterator ChildIteratorType; typedef llvm::df_iterator nodes_iterator; - static inline NodeRef getEntryNode(NodeRef N) { return N; } + static NodeRef getEntryNode(NodeRef N) { return N; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->succ_begin(); - } + static ChildIteratorType child_begin(NodeRef N) { return N->succ_begin(); } - static inline ChildIteratorType child_end(NodeRef N) { - return N->succ_end(); - } + static ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } - static inline nodes_iterator nodes_begin(NodeRef N) { return df_begin(N); } + static nodes_iterator nodes_begin(NodeRef N) { return df_begin(N); } - static inline nodes_iterator nodes_end(NodeRef N) { return df_end(N); } + static nodes_iterator nodes_end(NodeRef N) { return df_end(N); } }; } // end llvm namespace -- 2.40.0