[cfe-commits] r102283 - in /cfe/trunk: include/clang/AST/UsuallyTinyPtrVector.h lib/Sema/SemaDeclCXX.cpp

[Anders Carlsson]

Author: andersca
Date: Sat Apr 24 17:54:32 2010
New Revision: 102283

URL: http://llvm.org/viewvc/llvm-project?rev=102283&view=rev
Log:
Add an explicit UsuallyTinyPtrVector that takes a single element.

Modified:
    cfe/trunk/include/clang/AST/UsuallyTinyPtrVector.h
    cfe/trunk/lib/Sema/SemaDeclCXX.cpp

Modified: cfe/trunk/include/clang/AST/UsuallyTinyPtrVector.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/UsuallyTinyPtrVector.h?rev=102283&r1=102282&r2=102283&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/UsuallyTinyPtrVector.h (original)
+++ cfe/trunk/include/clang/AST/UsuallyTinyPtrVector.h Sat Apr 24 17:54:32 2010
@@ -33,7 +33,9 @@
 
 public:
   UsuallyTinyPtrVector() : Storage(0) { }
-
+  explicit UsuallyTinyPtrVector(T *Element) 
+    : Storage(reinterpret_cast<uintptr_t>(Element)) { }
+  
   bool empty() const { return !Storage; }
 
   typedef const T **iterator;

Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=102283&r1=102282&r2=102283&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Sat Apr 24 17:54:32 2010
@@ -1503,11 +1503,10 @@
                           SourceLocation(), ParamType, 0);
     
     // Cast to the base class to avoid ambiguities.
-    CXXBaseSpecifierArray BasePath;
-    BasePath.push_back(BaseSpec);
     SemaRef.ImpCastExprToType(CopyCtorArg, BaseSpec->getType(), 
                               CastExpr::CK_UncheckedDerivedToBase,
-                              /*isLvalue=*/true, BasePath);
+                              /*isLvalue=*/true, 
+                              CXXBaseSpecifierArray(BaseSpec));
 
     InitializationKind InitKind
       = InitializationKind::CreateDirect(Constructor->getLocation(),