Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

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

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 762a7f952ea4f15519becdd70e850d8a05237e60..402bd80b6e8baf329b52b07c16275751f8c0b95b 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -29,10 +29,6 @@
 #include "translator.hh"
 #include "warn.hh"
 
-using std::set;
-using std::string;
-using std::vector;
-
 Context_def::Context_def ()
 {
   context_aliases_ = SCM_EOL;
@@ -86,7 +82,7 @@ Context_def::~Context_def ()
 {
 }
 
-const char Context_def::type_p_name_[] = "ly:context-def?";
+const char * const Context_def::type_p_name_ = "ly:context-def?";
 
 int
 Context_def::print_smob (SCM port, scm_print_state *) const