From fea8db080353e408a38ad9b66b50b1c9dfaf96de Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 19 Dec 2020 17:12:05 +0300 Subject: Various fixes --- xsd-examples/cxx/parser/performance/driver.cxx | 5 +++-- xsd-examples/cxx/parser/performance/time.cxx | 4 ++-- xsd-examples/cxx/tree/embedded/xsdbin.cxx | 2 +- xsd-examples/cxx/tree/performance/parsing.cxx | 3 ++- xsd-examples/cxx/tree/performance/serialization.cxx | 3 ++- xsd-examples/cxx/tree/performance/time.cxx | 4 ++-- 6 files changed, 12 insertions(+), 9 deletions(-) (limited to 'xsd-examples') diff --git a/xsd-examples/cxx/parser/performance/driver.cxx b/xsd-examples/cxx/parser/performance/driver.cxx index 4ac0265..6e0ae5d 100644 --- a/xsd-examples/cxx/parser/performance/driver.cxx +++ b/xsd-examples/cxx/parser/performance/driver.cxx @@ -302,7 +302,7 @@ main (int argc, char* argv[]) root_p.pre (); doc.parse_begin (xml_parser, public_id); - XML_Parse (xml_parser, buf, size, 1); + XML_Parse (xml_parser, buf, static_cast (size), 1); doc.parse_end (); root_p.post_root (); @@ -321,7 +321,8 @@ main (int argc, char* argv[]) cerr << "time: " << time << " sec" << endl; - double ms (time.sec () * 1000000ULL + time.nsec () / 1000ULL); + double ms (static_cast ( + time.sec () * 1000000ULL + time.nsec () / 1000ULL)); // Calculate throughput in documents/sec. // diff --git a/xsd-examples/cxx/parser/performance/time.cxx b/xsd-examples/cxx/parser/performance/time.cxx index c8c1002..53bd237 100644 --- a/xsd-examples/cxx/parser/performance/time.cxx +++ b/xsd-examples/cxx/parser/performance/time.cxx @@ -3,7 +3,7 @@ #include "time.hxx" -#if defined (WIN32) || defined (__WIN32__) +#ifdef _WIN32 # define WIN32_LEAN_AND_MEAN # include // 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 ( 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 ( + 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 ( + 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 // 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 ( -- cgit v1.1