[llvm-branch-commits] [cfe-branch] r196570 - Merging r196459:

[Bill Wendling]

Author: void
Date: Fri Dec  6 03:07:48 2013
New Revision: 196570

URL: http://llvm.org/viewvc/llvm-project?rev=196570&view=rev
Log:
Merging r196459:
------------------------------------------------------------------------
r196459 | rtrieu | 2013-12-04 18:52:09 -0800 (Wed, 04 Dec 2013) | 2 lines

Remove unused variable.

------------------------------------------------------------------------

Modified:
    cfe/branches/release_34/   (props changed)
    cfe/branches/release_34/lib/Sema/TreeTransform.h

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  6 03:07:48 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195249,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195635,195669,195687,195693,195710,195713,195716,195756,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195936-195943,195970,195983,196045,196048,196050,196058,196114-196115,196153,196206,196215,196370,196387,196423,196454
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195249,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195635,195669,195687,195693,195710,195713,195716,195756,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195936-195943,195970,195983,196045,196048,196050,196058,196114-196115,196153,196206,196215,196370,196387,196423,196454,196459
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_34/lib/Sema/TreeTransform.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/lib/Sema/TreeTransform.h?rev=196570&r1=196569&r2=196570&view=diff
==============================================================================
--- cfe/branches/release_34/lib/Sema/TreeTransform.h (original)
+++ cfe/branches/release_34/lib/Sema/TreeTransform.h Fri Dec  6 03:07:48 2013
@@ -8305,7 +8305,6 @@ TreeTransform<Derived>::TransformLambdaE
             OldVD->getType()->isReferenceType(), OldVD->getIdentifier(), 
             NewExprInit);
     NewExprInitResult = NewExprInit;
-    VarDecl *NewVD = 0;
     InitCaptureExprsAndTypes[C - E->capture_begin()] =
         std::make_pair(NewExprInitResult, NewInitCaptureType);