Imported Upstream version 2.16.0

[lilypond.git] / flower / include / flower-proto.hh

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index adb6d349b15e030dace3cad47df6f7c208b09c58..33f67dbb4024815dd10cc988f0e9782104805228 100644 (file)
--- 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--2012 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;
@@ -37,12 +37,12 @@ template<class T, class A> class Matrix;
 
 typedef Interval_t<Real> Interval;
 
-struct Offset;
+class Offset;
 struct Long_option_init;
-struct Rational;
+class Rational;
 class File_name;
 class File_path;
-struct Getopt_long;
+class Getopt_long;
 
 typedef unsigned char U8;
 typedef short I16;