Release: bump Welcome versions.

[lilypond.git] / lily / include / lily-guile-macros.hh

diff --git a/lily/include/lily-guile-macros.hh b/lily/include/lily-guile-macros.hh
index d1728d8fd2d1e17bea9755d9a11fc013764367ea..869a52af327c137a72b634e8ac837630f94acfd8 100644 (file)
--- a/lily/include/lily-guile-macros.hh
+++ b/lily/include/lily-guile-macros.hh
@@ -25,7 +25,7 @@
 #if GUILEV2
 // if Guile's internal representation switches to utf8, this should be
 // changed accordingly for efficiency's sake.  This is used for
-// strings known to be in ASCII entirely, including any std::string
+// strings known to be in ASCII entirely, including any string
 // constants in the C code.
 #define scm_from_ascii_string scm_from_latin1_string
 #define scm_from_ascii_stringn scm_from_latin1_stringn
@@ -77,7 +77,7 @@ scm_or_str2symbol (SCM s)
 }
 
 /* Using this trick we cache the value of scm_from_locale_symbol ("fooo") where
-   "fooo" is a constant std::string. This is done at the cost of one static
+   "fooo" is a constant string. This is done at the cost of one static
    variable per ly_symbol2scm() use, and one boolean evaluation for
    every call.
  */
@@ -107,10 +107,10 @@ inline SCM ly_symbol2scm (char const *x) { return scm_from_utf8_symbol ((x)); }
   static SCM NAME ARGS;                         \
   static SCM NAME ## _proc
 
-std::string mangle_cxx_identifier (std::string);
+string mangle_cxx_identifier (string);
 
-void ly_add_type_predicate (void *ptr, const std::string &name);
-std::string predicate_to_typename (void *ptr);
+void ly_add_type_predicate (void *ptr, const string &name);
+string predicate_to_typename (void *ptr);
 
 /*
   Make TYPE::FUNC available as a Scheme function.
@@ -120,8 +120,8 @@ std::string predicate_to_typename (void *ptr);
   void                                                                  \
   TYPE ## _ ## FUNC ## _init_functions ()                               \
   {                                                                     \
-    std::string cxx = std::string (#TYPE) + "::" + std::string (#FUNC); \
-    std::string id = mangle_cxx_identifier (cxx); \
+    string cxx = string (#TYPE) + "::" + string (#FUNC); \
+    string id = mangle_cxx_identifier (cxx); \
     TYPE ::FUNC ## _proc = scm_c_define_gsubr (id.c_str(),                      \
                                                (ARGCOUNT-OPTIONAL_COUNT), OPTIONAL_COUNT, 0,    \
                                                (scm_t_subr) TYPE::FUNC); \
@@ -139,8 +139,8 @@ std::string predicate_to_typename (void *ptr);
 #define MAKE_SCHEME_CALLBACK(TYPE, FUNC, ARGCOUNT)                      \
   MAKE_SCHEME_CALLBACK_WITH_OPTARGS(TYPE,FUNC,ARGCOUNT, 0, "");
 
-void ly_add_function_documentation (SCM proc, const std::string &fname, const std::string &varlist, const std::string &doc);
-void ly_check_name (const std::string &cxx, const std::string &fname);
+void ly_add_function_documentation (SCM proc, const string &fname, const string &varlist, const string &doc);
+void ly_check_name (const string &cxx, const string &fname);
 
 #define ADD_SCM_INIT_FUNC(name, func)           \
   class name ## _scm_initter                    \