diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-01-12 15:22:45 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-01-12 15:22:45 (GMT) |
| commit | 6d0622c0bb8f0e52589c82252f2cc1eb847ad9bf (patch) | |
| tree | cbb87d3447f0972fe61d7db8454804035d4f1184 /src/uscxml/concurrency | |
| parent | 9e7e73725c20fbc95dccd9c1477a4d7c907be321 (diff) | |
| download | uscxml-6d0622c0bb8f0e52589c82252f2cc1eb847ad9bf.zip uscxml-6d0622c0bb8f0e52589c82252f2cc1eb847ad9bf.tar.gz uscxml-6d0622c0bb8f0e52589c82252f2cc1eb847ad9bf.tar.bz2 | |
Started to fix Windows compilation issues
Diffstat (limited to 'src/uscxml/concurrency')
| -rw-r--r-- | src/uscxml/concurrency/tinythread.cpp | 7 | ||||
| -rw-r--r-- | src/uscxml/concurrency/tinythread.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/uscxml/concurrency/tinythread.cpp b/src/uscxml/concurrency/tinythread.cpp index 56363b7..4a99259 100644 --- a/src/uscxml/concurrency/tinythread.cpp +++ b/src/uscxml/concurrency/tinythread.cpp @@ -31,15 +31,14 @@ freely, subject to the following restrictions: #include <process.h> #endif - namespace tthread { -uint64_t timeStamp() { - uint64_t time = 0; +unsigned long long int timeStamp() { + unsigned long long int time = 0; #ifdef WIN32 FILETIME tv; GetSystemTimeAsFileTime(&tv); - time = (((uint64_t) tv.dwHighDateTime) << 32) + tv.dwLowDateTime; + time = (((unsigned long long int) tv.dwHighDateTime) << 32) + tv.dwLowDateTime; time /= 10000; #else struct timeval tv; diff --git a/src/uscxml/concurrency/tinythread.h b/src/uscxml/concurrency/tinythread.h index 537cc04..aa8335b 100644 --- a/src/uscxml/concurrency/tinythread.h +++ b/src/uscxml/concurrency/tinythread.h @@ -152,7 +152,7 @@ freely, subject to the following restrictions: /// the std::mutex class. namespace tthread { -uint64_t timeStamp(); +unsigned long long int timeStamp(); /// Mutex class. /// This is a mutual exclusion object for synchronizing access to shared |