summaryrefslogtreecommitdiff
path: root/flower
diff options
context:
space:
mode:
authorGraham Percival <graham@percival-music.ca>2011-12-08 21:40:09 -0800
committerGraham Percival <graham@percival-music.ca>2011-12-14 01:51:07 -0800
commit814dd7be6256476f43f3923033c2da95e460ce2f (patch)
tree406bc9b83e144b9d9b01bf74930003f870af89de /flower
parent59c56667425ec6fae59655cf01ee724e024c0ebd (diff)
Avoid redefining struct String_convert to class.
Diffstat (limited to 'flower')
-rw-r--r--flower/include/flower-proto.hh4
1 files 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;