X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=d1ca0424bb3e0df24d958260bedc89f462cf02aa;hb=8659a99f233f5c4684292728e7ad4206669b35b0;hp=a014e018a6b4cbba32d35a0579d53157037b08a8;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index a014e018a6..d1ca0424bb 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -43,16 +43,16 @@
     A ly_B2A (B b);  */
 
 SCM ly_last (SCM list);
-std::string ly_scm_write_string (SCM s);
+string ly_scm_write_string (SCM s);
 SCM ly_deep_copy (SCM);
 SCM ly_truncate_list (int k, SCM lst);
 
-std::string gulp_file_to_string (const std::string &fn, bool must_exist, int size);
+string gulp_file_to_string (const string &fn, bool must_exist, int size);
 
-SCM ly_string2scm (std::string const &s);
-std::string ly_scm2string (SCM s);
-std::string ly_symbol2string (SCM);
-std::string robust_symbol2string (SCM, const std::string&);
+SCM ly_string2scm (string const &s);
+string ly_scm2string (SCM s);
+string ly_symbol2string (SCM);
+string robust_symbol2string (SCM, const string&);
 Rational ly_scm2rational (SCM);
 SCM ly_rational2scm (Rational);
 SCM ly_offset2scm (Offset);
@@ -63,6 +63,7 @@ SCM ly_assoc_cdr (SCM key, SCM alist);
 SCM ly_assoc_get (SCM key, SCM alist, SCM default_value, SCM strict_checking = SCM_BOOL_F);
 Interval ly_scm2interval (SCM);
 Drul_array<Real> ly_scm2realdrul (SCM);
+SCM ly_memv (SCM, SCM);
 Slice int_list_to_slice (SCM l);
 SCM ly_interval2scm (Drul_array<Real>);
 char *ly_scm2str0 (SCM str);
@@ -75,14 +76,14 @@ Drul_array<Real> robust_scm2drul (SCM, Drul_array<Real>);
 Drul_array<bool> robust_scm2booldrul (SCM, Drul_array<bool>);
 Interval robust_scm2interval (SCM, Drul_array<Real>);
 Offset robust_scm2offset (SCM, Offset);
-std::string robust_scm2string (SCM, const std::string&);
+string robust_scm2string (SCM, const string&);
 Rational robust_scm2rational (SCM, Rational);
-std::vector<Real> ly_scm2floatvector (SCM);
-SCM ly_floatvector2scm (std::vector<Real> v);
+vector<Real> ly_scm2floatvector (SCM);
+SCM ly_floatvector2scm (vector<Real> v);
 
 SCM ly_quote_scm (SCM s);
 bool type_check_assignment (SCM val, SCM sym, SCM type_symbol);
-std::string print_scm_val (SCM val);
+string print_scm_val (SCM val);
 SCM ly_number2string (SCM s);
 
 SCM parse_symbol_list (char const *);
@@ -137,7 +138,7 @@ extern "C" {
   void ly_display_scm (SCM s);
 }
 
-void read_lily_scm_file (std::string);
+void read_lily_scm_file (string);
 void ly_c_init_guile ();
 
 bool is_direction (SCM s);
@@ -202,7 +203,7 @@ inline bool ly_is_pair (SCM x) { return SCM_I_CONSP (x); }
 
 template<class T>
 SCM
-ly_cxx_vector_to_list (std::vector<T> const &src)
+ly_cxx_vector_to_list (vector<T> const &src)
 {
   SCM l = SCM_EOL;
   for (vsize i = src.size (); i--;)
@@ -211,8 +212,8 @@ ly_cxx_vector_to_list (std::vector<T> const &src)
   return l;
 }
 
-SCM ly_offsets2scm (std::vector<Offset> os);
-std::vector<Offset> ly_scm2offsets (SCM s);
+SCM ly_offsets2scm (vector<Offset> os);
+vector<Offset> ly_scm2offsets (SCM s);
 
 /* For backward compatability with Guile 1.8 */
 #if !HAVE_GUILE_HASH_FUNC