Merge branch 'master' into translation

[lilypond.git] / lily / include / dot-configuration.hh

diff --git a/lily/include/dot-configuration.hh b/lily/include/dot-configuration.hh
index cfc5ec67ca093780c71dc66c1e4bfce1c46e1ff1..b4e2219e6c3280bc9dff618b0d934fe12e6a97dd 100644 (file)
--- a/lily/include/dot-configuration.hh
+++ b/lily/include/dot-configuration.hh
@@ -42,7 +42,7 @@ struct Dot_position
   }
 };
 
-struct Dot_configuration : public std::map<int, Dot_position>
+struct Dot_configuration : public map<int, Dot_position>
 {
   Dot_formatting_problem const *problem_;