release: 1.3.18

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

diff --git a/flower/include/string.hh b/flower/include/string.hh
index b0bf9f8952980b466fec339dbc05a4a06162cdaf..16f6a81f049d219e2bd386d2d948f2e4588bfad0 100644 (file)
--- a/flower/include/string.hh
+++ b/flower/include/string.hh
@@ -11,12 +11,10 @@
 #define STRING_HH
 
 
-#include <string.h>
-#include <iostream.h>
 #include "arithmetic-operator.hh"
 #include "fproto.hh"
 #include "string-handle.hh"
-
+class ostream;
 /* Libg++ also has a String class.  Programming errors can lead to
   confusion about which String is in use.  Uncomment the following if you have 
   unexplained crashes after mucking with String
@@ -213,13 +211,6 @@ inline bool operator!=(char const* s1,String s2) {
 
 IMPLEMENT_ARITHMETIC_OPERATOR (String, +);
 
-inline ostream &
-operator << (ostream& os, String d)
-{
-  d.print_on (os);
-  return os;
-}
-
-
+ostream &operator << (ostream& os, String d);
 
 #endif