Mercurial > hg > svcore

changeset 691:b99dc5465b80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Seems check() is also sometimes defined on OS/X
author Chris Cannam
date Tue, 14 Jun 2011 15:28:42 +0100
parents 1424aa29ae95
children cb5eb032c28b 682101331278
files data/fileio/CachedFile.cpp data/fileio/CachedFile.h
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/data/fileio/CachedFile.cpp	Tue Jun 14 15:26:52 2011 +0100
+++ b/data/fileio/CachedFile.cpp	Tue Jun 14 15:28:42 2011 +0100
@@ -80,7 +80,7 @@
 
     SVDEBUG << "CachedFile::CachedFile: origin is \""
               << origin << "\"" << endl;
-    check();
+    checkFile();
 }
 
 CachedFile::CachedFile(QUrl url,
@@ -95,7 +95,7 @@
 
     SVDEBUG << "CachedFile::CachedFile: url is \""
               << url.toString() << "\"" << endl;
-    check();
+    checkFile();
 }
 
 CachedFile::~CachedFile()
@@ -115,7 +115,7 @@
 }
 
 void
-CachedFile::check()
+CachedFile::checkFile()
 {
     //!!! n.b. obvious race condition here if different CachedFile
     // objects for same url used in more than one thread -- need to
--- a/data/fileio/CachedFile.h	Tue Jun 14 15:26:52 2011 +0100
+++ b/data/fileio/CachedFile.h	Tue Jun 14 15:28:42 2011 +0100
@@ -46,7 +46,7 @@
     ProgressReporter *m_reporter;
     bool m_ok;
 
-    void check();
+    void checkFile();
     bool retrieve();
 
     QDateTime getLastRetrieval();