[llvm-branch-commits] [cfe-branch] r195989 - Merging r195897:

[Bill Wendling]

Author: void
Date: Sat Nov 30 20:09:57 2013
New Revision: 195989

URL: http://llvm.org/viewvc/llvm-project?rev=195989&view=rev
Log:
Merging r195897:
------------------------------------------------------------------------
r195897 | rikka | 2013-11-27 16:13:38 -0800 (Wed, 27 Nov 2013) | 1 line

Add a return statement to the func with an int return type.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_34/   (props changed)
    cfe/branches/release_34/test/SemaTemplate/instantiate-local-class.cpp

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 30 20:09:57 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,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195669,195687,195693,195710,195716,195760,195768,195827,195877,195887-195888,195983
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195669,195687,195693,195710,195716,195760,195768,195827,195877,195887-195888,195897,195983
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_34/test/SemaTemplate/instantiate-local-class.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/test/SemaTemplate/instantiate-local-class.cpp?rev=195989&r1=195988&r2=195989&view=diff
==============================================================================
--- cfe/branches/release_34/test/SemaTemplate/instantiate-local-class.cpp (original)
+++ cfe/branches/release_34/test/SemaTemplate/instantiate-local-class.cpp Sat Nov 30 20:09:57 2013
@@ -178,5 +178,6 @@ namespace PR14373 {
   };
   int call() {
     exec_func(Type());
+    return 0;
   }
 }