]> git.donarmstrong.com Git - lilypond.git/commitdiff
Avoid redefining struct String_convert to class.
authorGraham Percival <graham@percival-music.ca>
Fri, 9 Dec 2011 05:40:09 +0000 (21:40 -0800)
committerGraham Percival <graham@percival-music.ca>
Wed, 14 Dec 2011 09:51:07 +0000 (01:51 -0800)
flower/include/flower-proto.hh

index 7cdd7d9bf4fe2ff88f83c81b28e53df614f85838..e66c9905626be39e9a03f542ee7f4a73f18be38c 100644 (file)
@@ -24,12 +24,12 @@ char const *flower_version_str0 ();
 
 typedef unsigned char Byte;
 typedef long long I64;
-struct String_convert;
+class String_convert;
 
 #include "std-string.hh"
-using namespace std;
 
 #include "real.hh"
+using namespace std;
 
 template<class T> struct Interval_t;
 template<class T> struct PQueue;