Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index 706548774539a854ec5f91080e52565f9de1344d..45a1562b1f98a6d255c7da7d2af73f065744d66b 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -148,7 +148,7 @@ Context::create_unique_context (SCM name, string id, SCM operations)
     ret = daddy_context_->create_unique_context (name, id, operations);
   else
     {
-      warning (_f ("can't find or create new `%s'",
+      warning (_f ("cannot find or create new `%s'",
                   ly_symbol2string (name).c_str ()));
       ret = 0;
     }
@@ -210,7 +210,7 @@ Context::find_create_context (SCM n, string id, SCM operations)
     ret = daddy_context_->find_create_context (n, id, operations);
   else
     {
-      warning (_f ("can't find or create `%s' called `%s'",
+      warning (_f ("cannot find or create `%s' called `%s'",
                   ly_symbol2string (n).c_str (), id));
       ret = 0;
     }
@@ -385,7 +385,7 @@ Context::get_default_interpreter ()
       Context_def *t = unsmob_context_def (st);
       if (!t)
        {
-         warning (_f ("can't find or create: `%s'", name.c_str ()));
+         warning (_f ("cannot find or create: `%s'", name.c_str ()));
          t = unsmob_context_def (this->definition_);
        }
 
@@ -475,6 +475,12 @@ Context::internal_set_property (SCM sym, SCM val
 #endif
                                )
 {
+#ifndef NDEBUG
+  (void) file;
+  (void) line;
+  (void) fun;
+#endif
+
   if (do_internal_type_checking_global)
     assert (type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")));