From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 1 Feb 2006 00:11:25 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.7.31~30
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a4283836be09e0c68d8d6a120f6581b29d9bae96;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 4379998871..fa887d06d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,12 @@
 
 2006-02-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* lily/include/lily-guile-macros.hh (MAKE_SCHEME_CALLBACK): use
+	std::string not String. 
+
+	* lily/context-def.cc (path_to_acceptable_context): use INT_MAX
+	iso UINT_MAX.
+
 	* lily/prob.cc (Prob): copy type_ too.
 
 	* lily/lily-guile.cc (mangle_cxx_identifier): new
diff --git a/lily/context-def.cc b/lily/context-def.cc
index 545afabb1a..4dd527defb 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -217,7 +217,7 @@ Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const
 	}
     }
 
-  vsize best_depth = UINT_MAX;
+  vsize best_depth = INT_MAX;
   for (vsize i = 0; i < accepteds.size (); i++)
     {
       Context_def *g = accepteds[i];
diff --git a/lily/include/lily-guile-macros.hh b/lily/include/lily-guile-macros.hh
index 3eebaec544..fa6668f683 100644
--- a/lily/include/lily-guile-macros.hh
+++ b/lily/include/lily-guile-macros.hh
@@ -93,7 +93,7 @@ std::string mangle_cxx_identifier (std::string);
   void									\
   TYPE ## _ ## FUNC ## _init_functions ()				\
   {									\
-    std::string id = mangle_cxx_identifier (String (#TYPE) + "::" + String (#FUNC));\
+    std::string id = mangle_cxx_identifier (std::string (#TYPE) + "::" + std::string (#FUNC)); \
     TYPE ::FUNC ## _proc = scm_c_define_gsubr (id.c_str(),			\
 					       (ARGCOUNT), 0, 0,	\
 					       (Scheme_function_unknown) TYPE::FUNC); \