X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fflower-proto.hh;h=ded0f6da411451a2b1ccb1d62cd4de49912ac3ca;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=7cdd7d9bf4fe2ff88f83c81b28e53df614f85838;hpb=3cfcd0df1125efe0eddc1f361f9bf24243ed12b7;p=lilypond.git

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index 7cdd7d9bf4..ded0f6da41 100644
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Han-Wen Nienhuys
+  Copyright (C) 1996--2015 Han-Wen Nienhuys
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -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;