update pre-C++11 paragraphs

googlemock/include/gmock/gmock-generated-actions.h

@@ -259,11 +259,10 @@ class ActionHelper {
 //
 // CAVEAT:
 //
-// ACTION*() can only be used in a namespace scope.  The reason is
+// ACTION*() can only be used in a namespace scope as templates cannot be
-// that C++ doesn't yet allow function-local types to be used to
+// declared inside of a local class.
-// instantiate templates.  The up-coming C++0x standard will fix this.
+// Users can, however, define any local functors (e.g. a lambda) that
-// Once that's done, we'll consider supporting using ACTION*() inside
+// can be used as actions.
-// a function.
 //
 // MORE INFORMATION:
 //

googlemock/include/gmock/gmock-generated-actions.h.pump

@@ -182,11 +182,10 @@ $template
 //
 // CAVEAT:
 //
-// ACTION*() can only be used in a namespace scope.  The reason is
+// ACTION*() can only be used in a namespace scope as templates cannot be
-// that C++ doesn't yet allow function-local types to be used to
+// declared inside of a local class.
-// instantiate templates.  The up-coming C++0x standard will fix this.
+// Users can, however, define any local functors (e.g. a lambda) that
-// Once that's done, we'll consider supporting using ACTION*() inside
+// can be used as actions.
-// a function.
 //
 // MORE INFORMATION:
 //

googlemock/include/gmock/gmock-generated-matchers.h

@@ -250,11 +250,8 @@
 // overloading matchers based on parameter types (as opposed to just
 // based on the number of parameters).
 //
-// MATCHER*() can only be used in a namespace scope.  The reason is
+// MATCHER*() can only be used in a namespace scope as templates cannot be
-// that C++ doesn't yet allow function-local types to be used to
+// declared inside of a local class.
-// instantiate templates.  The up-coming C++0x standard will fix this.
-// Once that's done, we'll consider supporting using MATCHER*() inside
-// a function.
 //
 // More Information
 // ================

googlemock/include/gmock/gmock-generated-matchers.h.pump

@@ -252,11 +252,8 @@ $$ }} This line fixes auto-indentation of the following code in Emacs.
 // overloading matchers based on parameter types (as opposed to just
 // based on the number of parameters).
 //
-// MATCHER*() can only be used in a namespace scope.  The reason is
+// MATCHER*() can only be used in a namespace scope as templates cannot be
-// that C++ doesn't yet allow function-local types to be used to
+// declared inside of a local class.
-// instantiate templates.  The up-coming C++0x standard will fix this.
-// Once that's done, we'll consider supporting using MATCHER*() inside
-// a function.
 //
 // More Information
 // ================