X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscm-hash.hh;h=d14997676add36b8419b022bec71513e7c539b54;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=c5c2769e67ac646531bb748053d5ef71790a79c6;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index c5c2769e67..d14997676a 100644
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -1,66 +1,67 @@
-/*   
-  scm-hash.hh -- declare Scheme hasher.
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#ifndef SCM_HASH_HH
-#define SCM_HASH_HH
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-#include "lily-guile.hh"
-#include "smobs.hh"
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef SCM_HASH_HH
+#define SCM_HASH_HH
 
-/**
-   auto resizing hash table. 
+#include "smobs.hh"
 
-   1. ALWAYS USE THIS AS VIA A POINTER, i.e.
+/*
+  hash table.
 
-   class Foo {
-    Scheme_hash_table * tab;
-   };
+  1. ALWAYS USE THIS AS VIA A POINTER, i.e.
 
-   and NOT
+  class Foo {
+  Scheme_hash_table * tab;
+  };
 
-   class Foo {
-    Scheme_hash_table tab;
-   }
+  and NOT
 
+  class Foo {
+  Scheme_hash_table tab;
+  }
 
-   2. UPON DESTRUCTION, DO
 
-   scm_gc_unprotect_object (tab->self_scm_);
+  2. UPON DESTRUCTION, DO
 
- */
+  scm_gc_unprotect_object (tab->self_scm_);
+*/
 
-class Scheme_hash_table
-{  
+class Scheme_hash_table : public Smob<Scheme_hash_table>
+{
 public:
+  int print_smob (SCM, scm_print_state *);
+  SCM mark_smob ();
+  virtual ~Scheme_hash_table ();
   bool try_retrieve (SCM key, SCM *val);
   bool contains (SCM key) const;
-
-  /**
-     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);
+  void copy (Scheme_hash_table const &src);
 };
 
-
 #endif /* SCM_HASH_HH */
-