X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDepTable.C;h=8e0997f8cef643a55594c7430c86eb86bbfdae82;hb=501f1dd61b6c0beb927151ecf331f78848261b59;hp=bf986c18d6eab164708527352a746a4e498c1aee;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git

diff --git a/src/DepTable.C b/src/DepTable.C
index bf986c18d6..8e0997f8ce 100644
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -24,18 +24,25 @@
 #include "support/lyxlib.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+#include "support/lyxtime.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <fstream>
+#include <ctime>
+
+#ifndef CXX_GLOBAL_CSTD
+using std::time;
+#endif
 
 using std::make_pair;
 using std::ofstream;
 using std::ifstream;
 using std::flush;
 using std::endl;
+using std::getline;
 
 
 inline
@@ -73,7 +80,7 @@ void DepTable::insert(string const & fi, bool upd)
 void DepTable::update()
 {
 	lyxerr[Debug::DEPEND] << "Updating DepTable..." << endl;
-	time_t start_time = time(0);
+	lyx::time_type const start_time = lyx::current_time();
 
 	DepList::iterator itr = deplist.begin();
 	while (itr != deplist.end()) {
@@ -108,7 +115,7 @@ void DepTable::update()
 		}
 		++itr;
 	}
-	time_t time_sec = time(0) - start_time;
+	lyx::time_type const time_sec = lyx::current_time() - start_time;
 	lyxerr[Debug::DEPEND] << "Finished updating DepTable ("
 		<< time_sec << " sec)." << endl;
 }
@@ -220,13 +227,13 @@ void DepTable::write(string const & f) const
 			// CRC value.
 			// The older one is effectively set to 0 upon re-load.
 			lyxerr << "Write dep: "
-			       << cit->first << " "
-			       << cit->second.crc_cur << " "
-			       << cit->second.mtime_cur << endl;
+			       << cit->second.crc_cur << ' '
+			       << cit->second.mtime_cur << ' '
+			       << cit->first << endl;
 		}
-		ofs << cit->first << " "
-		    << cit->second.crc_cur << " "
-		    << cit->second.mtime_cur << endl;
+		ofs << cit->second.crc_cur << ' '
+		    << cit->second.mtime_cur << ' '
+		    << cit->first << endl;
 	}
 }
 
@@ -239,12 +246,13 @@ void DepTable::read(string const & f)
 	// This doesn't change through the loop.
 	di.crc_prev = 0;
 
-	while (ifs >> nome >> di.crc_cur >> di.mtime_cur) {
+	while (ifs >> di.crc_cur >> di.mtime_cur && getline(ifs, nome)) {
+		nome = ltrim(nome);
 		if (lyxerr.debugging(Debug::DEPEND)) {
 			lyxerr << "Read dep: "
-			       << nome << " "
-			       << di.crc_cur << " "
-			       << di.mtime_cur << endl;
+			       << di.crc_cur << ' '
+			       << di.mtime_cur << ' '
+			       << nome << endl;
 		}
 		deplist[nome] = di;
 	}