summaryrefslogtreecommitdiff
path: root/xsd-examples
diff options
context:
space:
mode:
Diffstat (limited to 'xsd-examples')
-rw-r--r--xsd-examples/cxx/parser/performance/driver.cxx5
-rw-r--r--xsd-examples/cxx/parser/performance/time.cxx4
-rw-r--r--xsd-examples/cxx/tree/embedded/xsdbin.cxx2
-rw-r--r--xsd-examples/cxx/tree/performance/parsing.cxx3
-rw-r--r--xsd-examples/cxx/tree/performance/serialization.cxx3
-rw-r--r--xsd-examples/cxx/tree/performance/time.cxx4
6 files changed, 12 insertions, 9 deletions
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 <int> (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<double> (
+ 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 <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 (
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 (