...

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index f07ccf50f1cb51ae682f5dc17425fa4e70285243..d79afa685d802b2132e9daa41d82a6941a3d41b5 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <fstream>
 #include <sstream>
 #include <string>
 #include <fstream>
 #include <sstream>

+#include <ostream>

 
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/stream.hpp>
 
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/stream.hpp>


@@ -12,8 +13,6 @@
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/copy.hpp>
 
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/copy.hpp>
 

-#include "writeout.h"
-

 #define CACHE_MODE_DISABLED 0
 #define CACHE_MODE_READ 1
 #define CACHE_MODE_FULL 2
 #define CACHE_MODE_DISABLED 0
 #define CACHE_MODE_READ 1
 #define CACHE_MODE_FULL 2


@@ -37,7 +36,7 @@ class configcache{
  public:
   ~configcache();
   configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 
  public:
   ~configcache();
   configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 

-             const int& cachemode=CACHE_MODE_FULL, writeout *out_a=NULL);
+             const int& cachemode=CACHE_MODE_FULL, ostream *_log=NULL);

   int readConfig(vector<unsigned long> *excludeFileHashes=NULL);
   void writeConfig();
   void addPara(const string& parid, const double& val=0);
   int readConfig(vector<unsigned long> *excludeFileHashes=NULL);
   void writeConfig();
   void addPara(const string& parid, const double& val=0);


@@ -49,6 +48,7 @@ class configcache{
   static unsigned long hash(const string& str);
 
  private:
   static unsigned long hash(const string& str);
 
  private:

+  ostream* log;

   infiledesc openFileDesc;
   void finishOutFile();
   int getParIndex(const string& parid);
   infiledesc openFileDesc;
   void finishOutFile();
   int getParIndex(const string& parid);


@@ -62,8 +62,6 @@ class configcache{
   ofstream outFile;
   ifstream inFile;
 
   ofstream outFile;
   ifstream inFile;
 

-  writeout *out;
-

   stringstream outFileName;
 
   int readnum;
   stringstream outFileName;
 
   int readnum;