X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=23b3c64785edef95c978f2553d734da4a394f8a3;hb=e93d8c812c66f040fe997488b4c83e1b89e28e87;hp=b51629fa150f015c7b1cb8a209d468c8a8a9f579;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index b51629fa15..23b3c64785 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -41,10 +41,10 @@ SCM ly_to_symbol (SCM scm);
 
 extern SCM global_lily_module;
 
-std::string gulp_file_to_string (std::string fn, bool must_exist, int size);
+string gulp_file_to_string (string fn, bool must_exist, int size);
 
-std::string ly_scm2string (SCM s);
-std::string ly_symbol2string (SCM);
+string ly_scm2string (SCM s);
+string ly_symbol2string (SCM);
 SCM ly_offset2scm (Offset);
 Offset ly_scm2offset (SCM);
 SCM ly_chain_assoc (SCM key, SCM achain);
@@ -67,7 +67,7 @@ Offset robust_scm2offset (SCM, Offset);
 
 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 *);
@@ -76,7 +76,7 @@ SCM alist_to_hashq (SCM);
 
 SCM ly_alist_vals (SCM alist);
 SCM ly_hash2alist (SCM tab);
-
+SCM ly_hash_table_keys (SCM tab);
 int procedure_arity (SCM);
 
 /* inserts at front, removing dublicates */
@@ -121,7 +121,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);