remove deprecated methods

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

2 files changed, 5 insertions, 26 deletions

diff --git a/include/llvm/Function.h b/include/llvm/Function.h
index 38f33ceeb8..14a5e48a1c 100644
--- a/include/llvm/Function.h
+++ b/include/llvm/Function.h
@@ -195,17 +195,6 @@ public:
   size_t                      arg_size () const { return ArgumentList.size();  }
   bool                        arg_empty() const { return ArgumentList.empty(); }
 
-  //===--------------------------------------------------------------------===//
-  // Argument iterator forwarding functions (legacy, deprecated, will be removed)
-  //
-  arg_iterator                abegin()       { return ArgumentList.begin(); }
-  const_arg_iterator          abegin() const { return ArgumentList.begin(); }
-  arg_iterator                aend  ()       { return ArgumentList.end();   }
-  const_arg_iterator          aend  () const { return ArgumentList.end();   }
-
-  size_t                       asize() const { return ArgumentList.size();  }
-  bool                        aempty() const { return ArgumentList.empty(); }
-
   virtual void print(std::ostream &OS) const { print(OS, 0); }
   void print(std::ostream &OS, AssemblyAnnotationWriter *AAW) const;
 
diff --git a/include/llvm/Module.h b/include/llvm/Module.h
index 33b4c3de28..d4932fc855 100644
--- a/include/llvm/Module.h
+++ b/include/llvm/Module.h
@@ -186,21 +186,11 @@ public:
   // Module iterator forwarding functions
   //
   // Globals list interface
-  inline global_iterator                global_begin()       { return GlobalList.begin(); }
-  inline const_global_iterator          global_begin() const { return GlobalList.begin(); }
-  inline global_iterator                global_end  ()       { return GlobalList.end();   }
-  inline const_global_iterator          global_end  () const { return GlobalList.end();   }
-  inline bool                           global_empty() const { return GlobalList.empty(); }
-
-  //===--------------------------------------------------------------------===//
-  // Module iterator forwarding functions (legacy, deprecated, will be removed)
-  //
-  // Globals list interface
-  inline global_iterator                gbegin()       { return GlobalList.begin(); }
-  inline const_global_iterator          gbegin() const { return GlobalList.begin(); }
-  inline global_iterator                gend  ()       { return GlobalList.end();   }
-  inline const_global_iterator          gend  () const { return GlobalList.end();   }
-  inline bool                           gempty() const { return GlobalList.empty(); }
+  global_iterator       global_begin()       { return GlobalList.begin(); }
+  const_global_iterator global_begin() const { return GlobalList.begin(); }
+  global_iterator       global_end  ()       { return GlobalList.end(); }
+  const_global_iterator global_end  () const { return GlobalList.end(); }
+  bool                  global_empty() const { return GlobalList.empty(); }
 
   // FunctionList interface
   inline iterator                begin()       { return FunctionList.begin(); }