From 814dd7be6256476f43f3923033c2da95e460ce2f Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Thu, 8 Dec 2011 21:40:09 -0800
Subject: [PATCH 1/1] Avoid redefining struct String_convert to class.

---
 flower/include/flower-proto.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;
-- 
2.39.2