release: 1.3.0

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

diff --git a/flower/include/dstream.hh b/flower/include/dstream.hh
index a7379268ebcfae2c71f3ae4189ff871155680625..c207e21e38a65aece7627ad5cf71838b5192af7a 100644 (file)
--- a/flower/include/dstream.hh
+++ b/flower/include/dstream.hh
@@ -3,19 +3,16 @@
 
   source file of the Flower Library
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef DSTREAM_HH
 #define DSTREAM_HH
 
 #include "string.hh"
-#include "scalar.hh"
 
-const char eol= '\n';
 
-template<class K,class V>
-struct Assoc;
+const char eol= '\n';
 
 /**  Debug stream. 
    a class for providing debug output of nested structures,
@@ -41,7 +38,7 @@ class Dstream
   bool default_silence_b_;
   String current_classname_str_;
   void output (String s);
-  Assoc<String, bool> *silent_assoc_p_;
+  Dictionary<bool> *silent_dict_p_;
 
 public:
   void clear_silence();
@@ -54,12 +51,12 @@ public:
   virtual ~Dstream();
   Dstream &identify_as (String s);
 
-  /** 
-    Output a Scalar via the Dstream.  This is the only output
-    interface.  It explicitely delegates all implicit conversion 
-    to Scalar class.  
-    */
-  Dstream &operator << (Scalar);
+
+  Dstream &operator << (String);
+  Dstream &operator << (Real);
+  Dstream &operator << (int);  
+  Dstream &operator << (Rational);
+  Dstream &operator << (char);  
   /**
      Output memory locations.
   */