From: Graham Percival <graham@percival-music.ca>
Date: Fri, 9 Dec 2011 05:40:09 +0000 (-0800)
Subject: Avoid redefining struct String_convert to class.
X-Git-Tag: release/2.15.22-1~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=814dd7be6256476f43f3923033c2da95e460ce2f;hp=59c56667425ec6fae59655cf01ee724e024c0ebd;p=lilypond.git

Avoid redefining struct String_convert to class.
---

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index 7cdd7d9bf4..e66c990562 100644
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -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;