send_stream_event(...); macro should only produce one statement

[lilypond.git] / lily / context-def.cc

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 7e391740a6d2f4327df101a85f6b4df513e2c76f..762a7f952ea4f15519becdd70e850d8a05237e60 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -29,6 +29,10 @@
 #include "translator.hh"
 #include "warn.hh"
 
+using std::set;
+using std::string;
+using std::vector;
+
 Context_def::Context_def ()
 {
   context_aliases_ = SCM_EOL;
@@ -85,7 +89,7 @@ Context_def::~Context_def ()
 const char Context_def::type_p_name_[] = "ly:context-def?";
 
 int
-Context_def::print_smob (SCM port, scm_print_state *)
+Context_def::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Context_def ", port);
   scm_display (context_name_, port);
@@ -97,7 +101,7 @@ Context_def::print_smob (SCM port, scm_print_state *)
 }
 
 SCM
-Context_def::mark_smob ()
+Context_def::mark_smob () const
 {
   ASSERT_LIVE_IS_ALLOWED (self_scm ());