[lmi-commits] [4889] Remove some differences between 'dbdict.hpp' and 'ihs_dbdict.hpp'

[Greg Chicares]

Revision: 4889
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4889
Author:   chicares
Date:     2010-05-02 01:20:24 +0000 (Sun, 02 May 2010)
Log Message:
-----------
Remove some differences between 'dbdict.hpp' and 'ihs_dbdict.hpp'

Modified Paths:
--------------
    lmi/trunk/dbdict.cpp
    lmi/trunk/dbdict.hpp

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2010-05-01 23:11:52 UTC (rev 4888)
+++ lmi/trunk/dbdict.cpp        2010-05-02 01:20:24 UTC (rev 4889)
@@ -56,6 +56,11 @@
     dictionary = 0;
 }
 
+dict_map const& DBDictionary::GetDictionary() const
+{
+    return *dictionary;
+}
+
 //============================================================================
 void DBDictionary::Init(std::string const& NewFilename)
 {
@@ -88,12 +93,12 @@
         // stream from file
 // TODO ?? HERE WE NEED TO ADD A STREAMING METHOD
 // TODO ?? CachedDBDictionary = Dictionary = new dict_map(CachedFilename);
-        Init(); // TODO ?? KLUDGE
+        InitAntediluvian(); // TODO ?? KLUDGE
         }
 }
 
 //============================================================================
-void DBDictionary::Init()
+void DBDictionary::InitAntediluvian()
 {
     static int const n = 1 + TDBIndex::MaxIndex;
     int dims[n] = {1, 1, 1, 1, 1, 1, 1};

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2010-05-01 23:11:52 UTC (rev 4888)
+++ lmi/trunk/dbdict.hpp        2010-05-02 01:20:24 UTC (rev 4889)
@@ -48,9 +48,8 @@
   public:
     static DBDictionary& instance();
     ~DBDictionary();
+    dict_map const& GetDictionary() const;
     void Init(std::string const& NewFilename);
-    dict_map_val* Find(dict_map_val const& t);
-    dict_map const& GetDictionary();
     void WriteSampleDBFile();
     void WriteProprietaryDBFiles();
 
@@ -65,16 +64,13 @@
     static void InvalidateCache();
 
     static std::string CachedFilename;
-    void Init();
+    void InitAntediluvian();
 
     void AddEntry(dict_map_val const& e);
 
     dict_map* dictionary;
 };
 
-inline dict_map const& DBDictionary::GetDictionary()
-{return *dictionary;}
-
 void LMI_SO print_databases();
 
 #endif // dbdict_hpp