Issue 4878: Make type_p_name_ always char pointer

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

diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index f58304d834f684a32dcb98e646f6a9c2bdc8c10a..3453904f7152cf3c8cfe60b652fca9892803637a 100644 (file)
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -1,66 +1,63 @@
-/*   
-  scm-hash.hh -- declare Scheme hasher.
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c)  1999--2003 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.
 
+  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.
 
-#include "lily-guile.hh"
-#include "smobs.hh"
+  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 "small-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 Smob1<Scheme_hash_table>
+{
 public:
+  int print_smob (SCM, scm_print_state *) const;
   bool try_retrieve (SCM key, SCM *val);
-  bool elem_b (SCM key) const;
-
-  /**
-     WARNING: putting something in assumes responsibility for cleaning
-     up.  */
+  bool contains (SCM key) const;
   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 &); 
-  Scheme_hash_table (Scheme_hash_table const &);
-
+  void operator = (Scheme_hash_table const &);
   SCM to_alist () const;
+  static SCM make_smob ();
+
 private:
-  SCM hash_tab_;
-  unsigned elt_count_;
-  
-  DECLARE_SMOBS (Scheme_hash_table,foo);
+  SCM &hash_tab () const { return scm1 (); }
 };
 
-
 #endif /* SCM_HASH_HH */
-