Partial revert of r203179. The build bots are telling me that some out-of-tree builds...

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

diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index f73c3275a60ac78b8d0fee4007d0efe3f3eb977d..c2ebcaf4ac3296e949255b6464d2b226687f7dac 100644 (file)
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -372,6 +372,9 @@ public:
   static NamespaceDecl *CreateDeserialized(ASTContext &C, unsigned ID);
 
   typedef redeclarable_base::redecl_range redecl_range;
+  typedef redeclarable_base::redecl_iterator redecl_iterator;
+  using redeclarable_base::redecls_begin;
+  using redeclarable_base::redecls_end;
   using redeclarable_base::redecls;
   using redeclarable_base::getPreviousDecl;
   using redeclarable_base::getMostRecentDecl;
@@ -779,6 +782,9 @@ protected:
 
 public:
   typedef redeclarable_base::redecl_range redecl_range;
+  typedef redeclarable_base::redecl_iterator redecl_iterator;
+  using redeclarable_base::redecls_begin;
+  using redeclarable_base::redecls_end;
   using redeclarable_base::redecls;
   using redeclarable_base::getPreviousDecl;
   using redeclarable_base::getMostRecentDecl;
@@ -1568,6 +1574,9 @@ protected:
 
 public:
   typedef redeclarable_base::redecl_range redecl_range;
+  typedef redeclarable_base::redecl_iterator redecl_iterator;
+  using redeclarable_base::redecls_begin;
+  using redeclarable_base::redecls_end;
   using redeclarable_base::redecls;
   using redeclarable_base::getPreviousDecl;
   using redeclarable_base::getMostRecentDecl;
@@ -2406,6 +2415,9 @@ protected:
 
 public:
   typedef redeclarable_base::redecl_range redecl_range;
+  typedef redeclarable_base::redecl_iterator redecl_iterator;
+  using redeclarable_base::redecls_begin;
+  using redeclarable_base::redecls_end;
   using redeclarable_base::redecls;
   using redeclarable_base::getPreviousDecl;
   using redeclarable_base::getMostRecentDecl;
@@ -2590,6 +2602,9 @@ protected:
 
 public:
   typedef redeclarable_base::redecl_range redecl_range;
+  typedef redeclarable_base::redecl_iterator redecl_iterator;
+  using redeclarable_base::redecls_begin;
+  using redeclarable_base::redecls_end;
   using redeclarable_base::redecls;
   using redeclarable_base::getPreviousDecl;
   using redeclarable_base::getMostRecentDecl;

diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h
index 9e45740cd3ded52abdbe41e089f12d8fd94680f0..d281f19df88618e34241d695bd32ecc90ca6e7ee 100644 (file)
--- a/include/clang/AST/DeclBase.h
+++ b/include/clang/AST/DeclBase.h
@@ -780,6 +780,9 @@ public:
                         redecl_iterator());
   }
 
+  redecl_iterator redecls_begin() const { return redecls().begin(); }
+  redecl_iterator redecls_end() const { return redecls().end(); }
+
   /// \brief Retrieve the previous declaration that declares the same entity
   /// as this declaration, or NULL if there is no previous declaration.
   Decl *getPreviousDecl() { return getPreviousDeclImpl(); }

diff --git a/include/clang/AST/DeclCXX.h b/include/clang/AST/DeclCXX.h
index a729b59bbdc6cf2ce834d8219dba618e21a0a747..1f7c2bbfe19a7a04f155786b5108e7858ce80162 100644 (file)
--- a/include/clang/AST/DeclCXX.h
+++ b/include/clang/AST/DeclCXX.h
@@ -2729,6 +2729,9 @@ public:
   static UsingShadowDecl *CreateDeserialized(ASTContext &C, unsigned ID);
 
   typedef redeclarable_base::redecl_range redecl_range;
+  typedef redeclarable_base::redecl_iterator redecl_iterator;\r
+  using redeclarable_base::redecls_begin;\r
+  using redeclarable_base::redecls_end;\r
   using redeclarable_base::redecls;
   using redeclarable_base::getPreviousDecl;
   using redeclarable_base::getMostRecentDecl;

diff --git a/include/clang/AST/DeclObjC.h b/include/clang/AST/DeclObjC.h
index fc41639c94b1a3448a078ec4da8223e89cccaf0c..05e309eff265d5af53cc09c0234663db9b29e778 100644 (file)
--- a/include/clang/AST/DeclObjC.h
+++ b/include/clang/AST/DeclObjC.h
@@ -1262,6 +1262,9 @@ public:
                                bool RHSIsQualifiedID = false);
 
   typedef redeclarable_base::redecl_range redecl_range;
+  typedef redeclarable_base::redecl_iterator redecl_iterator;\r
+  using redeclarable_base::redecls_begin;\r
+  using redeclarable_base::redecls_end;\r
   using redeclarable_base::redecls;
   using redeclarable_base::getPreviousDecl;
   using redeclarable_base::getMostRecentDecl;
@@ -1568,6 +1571,9 @@ public:
   }
    
   typedef redeclarable_base::redecl_range redecl_range;
+  typedef redeclarable_base::redecl_iterator redecl_iterator;\r
+  using redeclarable_base::redecls_begin;\r
+  using redeclarable_base::redecls_end;\r
   using redeclarable_base::redecls;
   using redeclarable_base::getPreviousDecl;
   using redeclarable_base::getMostRecentDecl;

diff --git a/include/clang/AST/DeclTemplate.h b/include/clang/AST/DeclTemplate.h
index 1823b847b94a0ff33ce66553bb93bd3e3c34c422..5f22262980337fb0c258605e8592a02946cdba9a 100644 (file)
--- a/include/clang/AST/DeclTemplate.h
+++ b/include/clang/AST/DeclTemplate.h
@@ -711,6 +711,9 @@ public:
   }
 
   typedef redeclarable_base::redecl_range redecl_range;
+  typedef redeclarable_base::redecl_iterator redecl_iterator;\r
+  using redeclarable_base::redecls_begin;\r
+  using redeclarable_base::redecls_end;\r
   using redeclarable_base::redecls;
   using redeclarable_base::getPreviousDecl;
   using redeclarable_base::getMostRecentDecl;

diff --git a/include/clang/AST/Redeclarable.h b/include/clang/AST/Redeclarable.h
index 76b69062145f6270e590d905fe379dade6e0d2d2..1170eda819c2caa3e295f8dbc4afd3c7e593cb46 100644 (file)
--- a/include/clang/AST/Redeclarable.h
+++ b/include/clang/AST/Redeclarable.h
@@ -171,6 +171,9 @@ public:
                         redecl_iterator());
   }
 
+  redecl_iterator redecls_begin() const { return redecls().begin(); }
+  redecl_iterator redecls_end() const { return redecls().end(); }
+
   friend class ASTDeclReader;
   friend class ASTDeclWriter;
 };