[llvm-branch-commits] [cfe-branch] r155295 - in /cfe/branches/release_31: ./ lib/Sema/SemaDeclCXX.cpp test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Sat Apr 21 14:24:29 2012
New Revision: 155295

URL: http://llvm.org/viewvc/llvm-project?rev=155295&view=rev
Log:
Merging r155279:
------------------------------------------------------------------------
r155279 | chapuni | 2012-04-21 02:40:04 -0700 (Sat, 21 Apr 2012) | 1 line

SemaDeclCXX.cpp: Fix utf8 in comment.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_31/   (props changed)
    cfe/branches/release_31/lib/Sema/SemaDeclCXX.cpp
    cfe/branches/release_31/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 21 14:24:29 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:155076
+/cfe/trunk:155076,155279
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_31/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_31/lib/Sema/SemaDeclCXX.cpp?rev=155295&r1=155294&r2=155295&view=diff
==============================================================================
--- cfe/branches/release_31/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/branches/release_31/lib/Sema/SemaDeclCXX.cpp Sat Apr 21 14:24:29 2012
@@ -11091,7 +11091,7 @@
   //   static member function (although its type and value category are defined
   //   within a static member function as they are within a non-static member
   //   function). [ Note: this is because declaration matching does not occur
-  //  until the complete declarator is known. — end note ] 
+  //  until the complete declarator is known. - end note ]
   const FunctionProtoType *Proto = ProtoTL->getTypePtr();
   FindCXXThisExpr Finder(*this);
   

Propchange: cfe/branches/release_31/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 21 14:24:29 2012
@@ -1,2 +1,2 @@
 /cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,155076
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,155076,155279