[cfe-commits] r112178 - /cfe/trunk/include/clang/AST/DeclBase.h

[John McCall]

Author: rjmccall
Date: Thu Aug 26 04:52:08 2010
New Revision: 112178

URL: http://llvm.org/viewvc/llvm-project?rev=112178&view=rev
Log:
Apparently gcc doesn't always get injected class names right.


Modified:
    cfe/trunk/include/clang/AST/DeclBase.h

Modified: cfe/trunk/include/clang/AST/DeclBase.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclBase.h?rev=112178&r1=112177&r2=112178&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/DeclBase.h (original)
+++ cfe/trunk/include/clang/AST/DeclBase.h Thu Aug 26 04:52:08 2010
@@ -642,10 +642,13 @@
   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 @@
   : 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=;
 };