release: 1.3.0

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

diff --git a/flower/include/dstream.hh b/flower/include/dstream.hh
index d9f896e43449d5ee19544fad0dafb49248bcb400..c207e21e38a65aece7627ad5cf71838b5192af7a 100644 (file)
--- a/flower/include/dstream.hh
+++ b/flower/include/dstream.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef DSTREAM_HH
@@ -11,10 +11,8 @@
 
 #include "string.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,
@@ -40,7 +38,8 @@ 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();
   bool silent_b (String) const;
@@ -52,9 +51,12 @@ public:
   virtual ~Dstream();
   Dstream &identify_as (String s);
 
-  /** Output a string via the Dstream. This is the only output
-      interface. It delegates all conversion to String class.  */
-  Dstream &operator << (String s);
+
+  Dstream &operator << (String);
+  Dstream &operator << (Real);
+  Dstream &operator << (int);  
+  Dstream &operator << (Rational);
+  Dstream &operator << (char);  
   /**
      Output memory locations.
   */