diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2020-12-19 17:12:05 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2021-02-25 13:45:49 +0300 |
commit | fea8db080353e408a38ad9b66b50b1c9dfaf96de (patch) | |
tree | 19c060eb9d6b66104f3bff3e5ea940dd7441c74d /xsd-examples/cxx/tree | |
parent | 5e527213a2430bb3018e5eebd909aef294edf9b5 (diff) |
Various fixes
Diffstat (limited to 'xsd-examples/cxx/tree')
-rw-r--r-- | xsd-examples/cxx/tree/embedded/xsdbin.cxx | 2 | ||||
-rw-r--r-- | xsd-examples/cxx/tree/performance/parsing.cxx | 3 | ||||
-rw-r--r-- | xsd-examples/cxx/tree/performance/serialization.cxx | 3 | ||||
-rw-r--r-- | xsd-examples/cxx/tree/performance/time.cxx | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/xsd-examples/cxx/tree/embedded/xsdbin.cxx b/xsd-examples/cxx/tree/embedded/xsdbin.cxx index 3539c52..3f77078 100644 --- a/xsd-examples/cxx/tree/embedded/xsdbin.cxx +++ b/xsd-examples/cxx/tree/embedded/xsdbin.cxx @@ -350,7 +350,7 @@ main (int argc, char* argv[]) if (!outdir.empty ()) { -#if defined (WIN32) || defined (__WIN32__) +#ifdef _WIN32 hxx = outdir + '\\' + hxx; cxx = outdir + '\\' + cxx; #else diff --git a/xsd-examples/cxx/tree/performance/parsing.cxx b/xsd-examples/cxx/tree/performance/parsing.cxx index c41b57d..ba3fdee 100644 --- a/xsd-examples/cxx/tree/performance/parsing.cxx +++ b/xsd-examples/cxx/tree/performance/parsing.cxx @@ -145,7 +145,8 @@ parsing (const char* file, unsigned long iter, bool validate) cerr << " time: " << time << " sec" << endl; - double ms (time.sec () * 1000000ULL + time.nsec () / 1000ULL); + double ms (static_cast<double> ( + time.sec () * 1000000ULL + time.nsec () / 1000ULL)); // Calculate throughput in documents/sec. // diff --git a/xsd-examples/cxx/tree/performance/serialization.cxx b/xsd-examples/cxx/tree/performance/serialization.cxx index e81fcbd..e691b82 100644 --- a/xsd-examples/cxx/tree/performance/serialization.cxx +++ b/xsd-examples/cxx/tree/performance/serialization.cxx @@ -105,7 +105,8 @@ serialization (const char* file, unsigned long iter) cerr << " time: " << time << " sec" << endl; - double ms (time.sec () * 1000000ULL + time.nsec () / 1000ULL); + double ms (static_cast<double> ( + time.sec () * 1000000ULL + time.nsec () / 1000ULL)); // Calculate throughput in documents/sec. // diff --git a/xsd-examples/cxx/tree/performance/time.cxx b/xsd-examples/cxx/tree/performance/time.cxx index 48385a1..0f5413d 100644 --- a/xsd-examples/cxx/tree/performance/time.cxx +++ b/xsd-examples/cxx/tree/performance/time.cxx @@ -3,7 +3,7 @@ #include "time.hxx" -#if defined (WIN32) || defined (__WIN32__) +#ifdef _WIN32 # define WIN32_LEAN_AND_MEAN # include <windows.h> // GetSystemTimeAsFileTime #else @@ -19,7 +19,7 @@ namespace os time:: time () { -#if defined (WIN32) || defined (__WIN32__) +#ifdef _WIN32 FILETIME ft; GetSystemTimeAsFileTime (&ft); unsigned long long v ( |