[llvm-branch-commits] [cfe-branch] r159762 - in /cfe/branches/tooling: ./ include/clang/Tooling/Tooling.h test/SemaCXX/warn-unreachable.cpp

[Manuel Klimek]

Author: klimek
Date: Thu Jul  5 13:18:45 2012
New Revision: 159762

URL: http://llvm.org/viewvc/llvm-project?rev=159762&view=rev
Log:
Merging mainline.

Modified:
    cfe/branches/tooling/   (props changed)
    cfe/branches/tooling/include/clang/Tooling/Tooling.h
    cfe/branches/tooling/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/tooling/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  5 13:18:45 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:146581-159754
+/cfe/trunk:146581-159761
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/tooling/include/clang/Tooling/Tooling.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/tooling/include/clang/Tooling/Tooling.h?rev=159762&r1=159761&r2=159762&view=diff
==============================================================================
--- cfe/branches/tooling/include/clang/Tooling/Tooling.h (original)
+++ cfe/branches/tooling/include/clang/Tooling/Tooling.h Thu Jul  5 13:18:45 2012
@@ -77,7 +77,7 @@
 /// \brief Returns a new FrontendActionFactory for any type that provides an
 /// implementation of newASTConsumer().
 ///
-/// FactoryT must implement: FrontendAction *newASTConsumer().
+/// FactoryT must implement: ASTConsumer *newASTConsumer().
 ///
 /// Example:
 /// struct ProvidesASTConsumers {

Propchange: cfe/branches/tooling/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  5 13:18:45 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,146581-159754
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,146581-159761