[lmi-commits] [4890] Make 'dbdict.hpp' equivalent to 'ihs_dbdict.hpp'

[Greg Chicares]

Revision: 4890
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4890
Author:   chicares
Date:     2010-05-02 02:29:44 +0000 (Sun, 02 May 2010)
Log Message:
-----------
Make 'dbdict.hpp' equivalent to 'ihs_dbdict.hpp'

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

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2010-05-02 01:20:24 UTC (rev 4889)
+++ lmi/trunk/dbdict.hpp        2010-05-02 02:29:44 UTC (rev 4890)
@@ -1,6 +1,6 @@
 // Product-database map.
 //
-// Copyright (C) 1998, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 
Gregory W. Chicares.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 
2009, 2010 Gregory W. Chicares.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -48,7 +48,9 @@
   public:
     static DBDictionary& instance();
     ~DBDictionary();
+
     dict_map const& GetDictionary() const;
+
     void Init(std::string const& NewFilename);
     void WriteSampleDBFile();
     void WriteProprietaryDBFiles();
@@ -57,18 +59,20 @@
     DBDictionary();
 
     void WriteDB(std::string const& filename);
-    void Add(TDBValue const& e);
+    void Add(TDBValue const&);
     void BadFile(std::string const& Filename, std::string const& why);
     void InitDB();
 
+    void InitAntediluvian(); // Antediluvian
+
     static void InvalidateCache();
 
     static std::string CachedFilename;
-    void InitAntediluvian();
 
-    void AddEntry(dict_map_val const& e);
+    void AddEntry(dict_map_val const&); // Antediluvian
 
-    dict_map* dictionary;
+    dict_map dictionary_;
+    dict_map* dictionary; // Antediluvian
 };
 
 void LMI_SO print_databases();

Modified: lmi/trunk/ihs_dbdict.cpp
===================================================================
--- lmi/trunk/ihs_dbdict.cpp    2010-05-02 01:20:24 UTC (rev 4889)
+++ lmi/trunk/ihs_dbdict.cpp    2010-05-02 02:29:44 UTC (rev 4890)
@@ -119,6 +119,11 @@
 }
 } // Unnamed namespace.
 
+dict_map const& DBDictionary::GetDictionary() const
+{
+    return dictionary_;
+}
+
 //============================================================================
 void DBDictionary::Init(std::string const& NewFilename)
 {

Modified: lmi/trunk/ihs_dbdict.hpp
===================================================================
--- lmi/trunk/ihs_dbdict.hpp    2010-05-02 01:20:24 UTC (rev 4889)
+++ lmi/trunk/ihs_dbdict.hpp    2010-05-02 02:29:44 UTC (rev 4890)
@@ -52,8 +52,10 @@
   public:
     static DBDictionary& instance();
     ~DBDictionary();
+
+    dict_map const& GetDictionary() const;
+
     void Init(std::string const& NewFilename);
-    dict_map const& GetDictionary() const;
     void WriteSampleDBFile();
     void WriteProprietaryDBFiles();
 
@@ -61,19 +63,22 @@
     DBDictionary();
 
     void WriteDB(std::string const& filename);
-    void Add(TDBValue const& e);
+    void Add(TDBValue const&);
     void BadFile(std::string const& Filename, std::string const& why);
     void InitDB();
 
+    void InitAntediluvian(); // Antediluvian
+
     static void InvalidateCache();
 
     static std::string CachedFilename;
+
+    void AddEntry(dict_map_val const&); // Antediluvian
+
     dict_map dictionary_;
+    dict_map* dictionary; // Antediluvian
 };
 
-inline dict_map const& DBDictionary::GetDictionary() const
-{return dictionary_;}
-
 void LMI_SO print_databases();
 
 #endif // ihs_dbdict_hpp