libcp1: as committed to GCC trunk

2 files changed, 8 insertions, 8 deletions

diff --git a/include/gcc-cp-fe.def b/include/gcc-cp-fe.def
index 396931a6b60..c367c1db1eb 100644
--- a/include/gcc-cp-fe.def
+++ b/include/gcc-cp-fe.def
@@ -406,7 +406,7 @@ GCC_METHOD1 (gcc_decl, get_type_decl,
    class, be they template generics, template specializations or not
    templates.  TYPE must be a class type (not a template generic).
 
-   The new_friend call cannot introduce a declaration; even if the
+   The add_friend call cannot introduce a declaration; even if the
    friend is first declared as a friend in the source code, the
    declaration belongs in the enclosing namespace, so it must be
    introduced in that namespace, and the resulting declaration can
@@ -441,7 +441,7 @@ GCC_METHOD1 (gcc_decl, get_type_decl,
 
    In order to simplify such friend declarations, and to enable
    incremental friend declarations as template specializations are
-   introduced, new_friend can be called after the befriending class is
+   introduced, add_friend can be called after the befriending class is
    fully defined, passing it a non-NULL TYPE argument naming the
    befriending class type.  */
 
@@ -477,10 +477,10 @@ GCC_METHOD2 (gcc_type, build_pointer_to_member_type,
    GCC_CP_SYMBOL_FUNCTION or GCC_CP_SYMBOL_CLASS, that, when the scope
    is a template parameter list, declares a template function or a
    template class with the then-closed parameter list.  The scope in
-   which the new declaration is to be introduced by new_decl must be
-   entered before calling start_new_template_decl, and new_decl
-   returns to that scope, from the template parameter list scope,
-   before introducing the declaration.  */
+   which the new declaration is to be introduced by build_decl must be
+   entered before calling start_template_decl, and build_decl returns
+   to that scope, from the template parameter list scope, before
+   introducing the declaration.  */
 
 GCC_METHOD0 (int /* bool */, start_template_decl)
 
@@ -553,7 +553,7 @@ GCC_METHOD2 (gcc_utempl, build_dependent_class_template,
 	     gcc_type,			  /* Argument ENCLOSING_TYPE.  */
 	     const char *)			      /* Argument ID.  */
 
-/* Build a template-dependent template type id (e.g., T<A>).
+/* Build a template-dependent type template-id (e.g., T<A>).
    TEMPLATE_DECL should be a template template parameter (e.g., the T
    in template <template <[...]> class T = X>), and TARGS should
    specify the template arguments (e.g. <A>).  */
diff --git a/include/gcc-cp-interface.h b/include/gcc-cp-interface.h
index 83cb2d07189..6ef9e22f50c 100644
--- a/include/gcc-cp-interface.h
+++ b/include/gcc-cp-interface.h
@@ -41,7 +41,7 @@ struct gcc_cp_context;
 
 enum gcc_cp_api_version
 {
-  GCC_CP_FE_VERSION_0 = 0xffffffff-17
+  GCC_CP_FE_VERSION_0 = 0
 };
 
 /* Qualifiers.  */