* The grand 2005-2006 replace.

[lilypond.git] / lily / include / scm-hash.hh

diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index c5c2769e67ac646531bb748053d5ef71790a79c6..d21249db4bd615ec84c6f39b54b2139788168ffd 100644 (file)
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -1,44 +1,39 @@
-/*   
+/*
   scm-hash.hh -- declare Scheme hasher.
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef SCM_HASH_HH
 #define SCM_HASH_HH
 
-
-#include "lily-guile.hh"
 #include "smobs.hh"
 
-
 /**
-   auto resizing hash table. 
+   auto resizing hash table.
 
    1. ALWAYS USE THIS AS VIA A POINTER, i.e.
 
    class Foo {
-    Scheme_hash_table * tab;
+   Scheme_hash_table * tab;
    };
 
    and NOT
 
    class Foo {
-    Scheme_hash_table tab;
+   Scheme_hash_table tab;
    }
 
 
    2. UPON DESTRUCTION, DO
 
    scm_gc_unprotect_object (tab->self_scm_);
-
- */
+*/
 
 class Scheme_hash_table
-{  
+{
 public:
   bool try_retrieve (SCM key, SCM *val);
   bool contains (SCM key) const;
@@ -47,20 +42,20 @@ public:
      WARNING: putting something in assumes responsibility for cleaning
      up.  */
   void set (SCM k, SCM v);
-  SCM get (SCM k) const; 
+  SCM get (SCM k) const;
   void remove (SCM k);
   Scheme_hash_table ();
-  void operator = (Scheme_hash_table const &); 
+  void operator = (Scheme_hash_table const &);
   Scheme_hash_table (Scheme_hash_table const &);
 
   SCM to_alist () const;
+
 private:
   SCM hash_tab_;
   unsigned elt_count_;
-  
-  DECLARE_SMOBS (Scheme_hash_table,foo);
-};
 
+  DECLARE_SMOBS (Scheme_hash_table, foo);
+};
 
 #endif /* SCM_HASH_HH */