Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / flower / include / string-convert.hh

diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh
index 4717bfc49bfd71998312e8c3cf9c809f507ac94d..1277890929f73176253a00fedddc70cf9d09eb86 100644 (file)
--- a/flower/include/string-convert.hh
+++ b/flower/include/string-convert.hh
@@ -9,7 +9,6 @@
 #include <cstdarg>
 using namespace std;
 
-#include "std-string.hh"
 #include "flower-proto.hh"
 
 /** The functor string_convert handles all conversions to/from string
@@ -31,7 +30,7 @@ public:
   static int dec2int (string dec_string);
   static double dec2double (string dec_string);
   static string double_string (double f, char const *fmt = 0);
-  static string form_string (char const *format, ...);
+  static string form_string (char const *format, ...) __attribute__ ((format (printf, 1,2)));
   static string vform_string (char const *format, va_list args);
   static int hex2int (string str);
   static unsigned hex2unsigned (string str);