*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 437999887128bb1eb94624098cfce6a8f5089aff..fa887d06d70f607bd3c2888898fe5144bb277a16 100644 (file)
--- 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 545afabb1a7ffc626c22ace0659665f1aadf39d3..4dd527defbf3d91a82e28b1944ede796d0add7f8 100644 (file)
--- 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 3eebaec544a9e2a97c8c6c284691e27c533be014..fa6668f683d69679ede5e61f66c518a06ab05690 100644 (file)
--- 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); \