[lmi-commits] [lmi] master 7ea93d3 09/10: Adapt 2012-06-15 patches just applied to renamed caching class

[Greg Chicares]

branch: master
commit 7ea93d3b823eee80ab800fc731c192f38e60184a
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Adapt 2012-06-15 patches just applied to renamed caching class
---
 database.cpp |    2 +-
 dbdict.hpp   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/database.cpp b/database.cpp
index c586af3..6c7b65f 100644
--- a/database.cpp
+++ b/database.cpp
@@ -190,7 +190,7 @@ void product_database::initialize(std::string const& 
product_name)
     else
         {
         std::string 
filename(product_data(product_name).datum("DatabaseFilename"));
-        db_ = DBDictionary::get_cached(AddDataDir(filename));
+        db_ = DBDictionary::read_from_cache(AddDataDir(filename));
         }
     maturity_age_ = static_cast<int>(Query(DB_MaturityAge));
     length_ = maturity_age_ - index_.index_vector()[e_axis_issue_age];
diff --git a/dbdict.hpp b/dbdict.hpp
index 09221a1..549ec62 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -25,8 +25,8 @@
 #include "config.hpp"
 
 #include "any_member.hpp"
+#include "cache_file_reads.hpp"
 #include "dbvalue.hpp"
-#include "loaded_files_cache.hpp"
 #include "obstruct_slicing.hpp"
 #include "so_attributes.hpp"
 #include "uncopyable_lmi.hpp"
@@ -41,7 +41,7 @@ class LMI_SO DBDictionary
     ,virtual private obstruct_slicing  <DBDictionary>
     ,        public  xml_serializable  <DBDictionary>
     ,        public  MemberSymbolTable <DBDictionary>
-    ,        public  loaded_from_cache <DBDictionary>
+    ,        public  cache_file_reads  <DBDictionary>
 {
     friend class DatabaseDocument;
     friend class input_test;        // For test_product_database().