...

[phys/latlib.git] / hypercache.cpp

diff --git a/hypercache.cpp b/hypercache.cpp
index b025ba69822763723c7478271a1b037538cc861e..2d38b2168b1ec70d162fdb1cb767da8dfad46a30 100644 (file)
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -71,10 +71,12 @@ string hypercache::fileOfPath(const string& dressedfile) {
   return dressedfile.substr(dressedfile.find_last_of("\\/")+1);
 }
 
   return dressedfile.substr(dressedfile.find_last_of("\\/")+1);
 }
 

-bool hypercache::readC() { 
-  bool readret;
+int hypercache::readC() { 
+  int readret;

 
 

-  if ( readret = C->readConfig(&parentConfigs) )
+  readret = C->readConfig(&parentConfigs);
+
+  if ( readret == -1 )

     activeCFile = fileOfPath(C->getInFileName());
   else
     activeCFile = "";
     activeCFile = fileOfPath(C->getInFileName());
   else
     activeCFile = "";


@@ -96,15 +98,17 @@ void hypercache::writeO() {
   O->writeConfig(); 
 }
 
   O->writeConfig(); 
 }
 

-bool hypercache::readO() {
-  bool readret;
+int hypercache::readO() {
+  int readret;
+
+  readret = O->readConfig();

 
 

-  if ( readret = O->readConfig() ) {
+  if ( readret == -1 ) {

     unsigned long *parentconfig = (unsigned long*)O->getHeader("concurrent_cfile");
     if ( parentconfig != NULL )
       addParentConfig(parentconfig);
   }
     unsigned long *parentconfig = (unsigned long*)O->getHeader("concurrent_cfile");
     if ( parentconfig != NULL )
       addParentConfig(parentconfig);
   }

-
+  

   return readret;
 }
 
   return readret;
 }