ocaml 3.09 transition

[helm.git] / helm / DEVEL / mathml_editor / src / TDictionary.hh

diff --git a/helm/DEVEL/mathml_editor/src/TDictionary.hh b/helm/DEVEL/mathml_editor/src/TDictionary.hh
index f8eb69104f81711a9ef19d3065408e62977d2bf9..4864630f969cf0c36bb117a7a5855300aead6de2 100644 (file)
--- a/helm/DEVEL/mathml_editor/src/TDictionary.hh
+++ b/helm/DEVEL/mathml_editor/src/TDictionary.hh
@@ -1,26 +1,26 @@
-/* Copyright (C) 2002-2003, Luca Padovani <luca.padovani@cs.unibo.it>,
- *                    2003, Paolo Marinelli <pmarinel@cs.unibo.it>.
- *
- * This file is part of EdiTeX, an editor of mathematical
- * expressions based on TeX syntax
+/* This file is part of EdiTeX, an editor of mathematical
+ * expressions based on TeX syntax.
  * 
- * EdiTeX 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 2
- * of the License, or (at your option) any later version.
+ * Copyright (C) 2002-2003 Luca Padovani <lpadovan@cs.unibo.it>,
+ *                    2003 Paolo Marinelli <pmarinel@cs.unibo.it>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * EdiTeX is distributed in the hope that it will be useful,
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with EdiTeX; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- * 
- * For details, see the EdiTeX World-Wide-Web page,
- * http://helm.cs.unibo.it/editex, or send a mail to
- * <luca.padovani@cs.unibo.it>
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For more information, please visit the project's home page
+ * http://helm.cs.unibo.it/editex/
+ * or send an email to <lpadovan@cs.unibo.it>
  */
 
 #ifndef __TDictionary_hh__
@@ -30,7 +30,14 @@
 
 #include <string>
 #include <vector>
+#if defined(HAVE_EXT_HASH_MAP)
+#include <ext/hash_map>
+#elif defined(HAVE_HASH_MAP)
 #include <hash_map>
+#else
+#error "no hash_map could be found"
+#endif
+#include <list>
 
 #include "dom.hh"
 #include "TToken.hh"
@@ -83,14 +90,24 @@ public:
     unsigned table : 1;
   };
 
+  static std::string getDefaultDictionaryPath(void);
+
   void load(const std::string&);
   void load(const std::string&, const std::string&);
   void load(const DOM::Document&, const std::string& = "");
   const Entry& find(const std::string&) const;
+  std::string complete(const std::string, std::list<std::string>&) const;
 
 private:
+#if defined(HAVE_EXT_HASH_MAP)
+  struct StringHash : public std::unary_function< std::string, size_t >
+  { size_t operator()(const std::string& s) const { return __gnu_cxx::hash<char*>()(s.c_str()); } };
+#elif defined(HAVE_HASH_MAP)
   struct StringHash : public std::unary_function< std::string, size_t >
   { size_t operator()(const std::string& s) const { return hash<char*>()(s.c_str()); } };
+#else
+#error "no hash_map could be found"
+#endif
 
 #if 0
   struct StringEq : public std::binary_function< std::string, std::string, bool >