summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2012-01-20 16:39:18 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2012-01-20 16:39:18 +0000
commit4d08ccb2d5e568cd27e0a368af655a1b0185acae (patch)
treee1fe65ef4a2e93571a53107cbef68a0bffa651fe
parentd6a58286f5811d76e7a23ad1b349368bf15b3396 (diff)
downloadbcm5719-llvm-4d08ccb2d5e568cd27e0a368af655a1b0185acae.tar.gz
bcm5719-llvm-4d08ccb2d5e568cd27e0a368af655a1b0185acae.zip
Replace a dubious use of SmallVectorImpl with a proper copy.
llvm-svn: 148549
-rw-r--r--clang/lib/Sema/SemaTemplateDeduction.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaTemplateDeduction.cpp b/clang/lib/Sema/SemaTemplateDeduction.cpp
index 4fff827206c..137556fa214 100644
--- a/clang/lib/Sema/SemaTemplateDeduction.cpp
+++ b/clang/lib/Sema/SemaTemplateDeduction.cpp
@@ -1335,8 +1335,8 @@ DeduceTemplateArgumentsByTypeMatch(Sema &S,
SmallVector<const RecordType *, 8> ToVisit;
ToVisit.push_back(RecordT);
bool Successful = false;
- SmallVectorImpl<DeducedTemplateArgument> DeducedOrig(0);
- DeducedOrig = Deduced;
+ SmallVector<DeducedTemplateArgument, 8> DeducedOrig(Deduced.begin(),
+ Deduced.end());
while (!ToVisit.empty()) {
// Retrieve the next class in the inheritance hierarchy.
const RecordType *NextT = ToVisit.back();
@@ -1358,7 +1358,8 @@ DeduceTemplateArgumentsByTypeMatch(Sema &S,
// from this base class.
if (BaseResult == Sema::TDK_Success) {
Successful = true;
- DeducedOrig = Deduced;
+ DeducedOrig.clear();
+ DeducedOrig.append(Deduced.begin(), Deduced.end());
}
else
Deduced = DeducedOrig;
OpenPOWER on IntegriCloud