Pull predecessor and successor iterators out of the CFG*.h files, and plop them into

the BasicBlock class where they should be.  pred_begin/pred_end become methods on BasicBlock,
and the cfg namespace isn't used anymore.

Also pull Interval stuff into the Interval class out of the global namespace


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@690 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 12 insertions, 20 deletions

diff --git a/include/llvm/Analysis/Interval.h b/include/llvm/Analysis/Interval.h
index 1d708b691c..db9d67c15a 100644
--- a/include/llvm/Analysis/Interval.h
+++ b/include/llvm/Analysis/Interval.h
@@ -87,28 +87,20 @@ public:
 
   // isLoop - Find out if there is a back edge in this interval...
   bool isLoop() const;
-};
 
 
-// succ_begin/succ_end - define global functions so that Intervals may be used
-// just like BasicBlocks can with the succ_* functions, and *::succ_iterator.
-//
-inline Interval::succ_iterator succ_begin(Interval *I) { 
-  return I->Successors.begin();
-}
-inline Interval::succ_iterator succ_end(Interval *I) { 
-  return I->Successors.end();
-}
-
-// pred_begin/pred_end - define global functions so that Intervals may be used
-// just like BasicBlocks can with the pred_* functions, and *::pred_iterator.
-//
-inline Interval::pred_iterator pred_begin(Interval *I) { 
-  return I->Predecessors.begin();
-}
-inline Interval::pred_iterator pred_end(Interval *I) { 
-  return I->Predecessors.end();
-}
+  // succ_begin/succ_end - define methods so that Intervals may be used
+  // just like BasicBlocks can with the succ_* functions, and *::succ_iterator.
+  //
+  inline succ_iterator succ_begin() { return Successors.begin(); }
+  inline succ_iterator succ_end()   { return Successors.end(); }
+  
+  // pred_begin/pred_end - define methods so that Intervals may be used
+  // just like BasicBlocks can with the pred_* functions, and *::pred_iterator.
+  //
+  inline Interval::pred_iterator pred_begin() { return Predecessors.begin(); }
+  inline Interval::pred_iterator pred_end()   { return Predecessors.end(); }
+};
 
 }    // End namespace cfg