Apparently gcc doesn't always get injected class names right.

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

1 files changed, 10 insertions, 6 deletions

diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h
index 79e4541c90..e5bdd9ee48 100644
--- a/include/clang/AST/DeclBase.h
+++ b/include/clang/AST/DeclBase.h
@@ -642,10 +642,13 @@ public:
   virtual void print(llvm::raw_ostream &OS) const;
 };
 
-class DeclContextLookupResult : public std::pair<NamedDecl**,NamedDecl**> {
+class DeclContextLookupResult
+  : public std::pair<NamedDecl**,NamedDecl**> {
 public:
-  DeclContextLookupResult(NamedDecl **I, NamedDecl **E) : pair(I, E) {}
-  DeclContextLookupResult() : pair() {}
+  DeclContextLookupResult(NamedDecl **I, NamedDecl **E)
+    : std::pair<NamedDecl**,NamedDecl**>(I, E) {}
+  DeclContextLookupResult()
+    : std::pair<NamedDecl**,NamedDecl**>() {}
 
   using pair::operator=;
 };
@@ -654,10 +657,11 @@ class DeclContextLookupConstResult
   : public std::pair<NamedDecl*const*, NamedDecl*const*> {
 public:
   DeclContextLookupConstResult(std::pair<NamedDecl**,NamedDecl**> R)
-    : pair(R) {}
+    : std::pair<NamedDecl*const*, NamedDecl*const*>(R) {}
   DeclContextLookupConstResult(NamedDecl * const *I, NamedDecl * const *E)
-    : pair(I, E) {}
-  DeclContextLookupConstResult() : pair() {}
+    : std::pair<NamedDecl*const*, NamedDecl*const*>(I, E) {}
+  DeclContextLookupConstResult()
+    : std::pair<NamedDecl*const*, NamedDecl*const*>() {}
 
   using pair::operator=;
 };