From be4e2595d69ce6147668f22a2d9b7d263cbcbd25 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 8 Apr 2009 10:22:52 +0200
Subject: Get rid of warnings

---
 examples/cxx/hybrid/minimal/driver.cxx               | 9 ++++++---
 examples/cxx/serializer/minimal/driver.cxx           | 9 ++++++---
 tests/cxx/hybrid/makefile                            | 2 +-
 tests/cxx/hybrid/sequences/driver.cxx                | 2 +-
 tests/cxx/parser/validation/built-in/long/driver.cxx | 2 +-
 xsde/cxx/serializer/driver-source.cxx                | 9 ++++++---
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/examples/cxx/hybrid/minimal/driver.cxx b/examples/cxx/hybrid/minimal/driver.cxx
index f1a43af..6573237 100644
--- a/examples/cxx/hybrid/minimal/driver.cxx
+++ b/examples/cxx/hybrid/minimal/driver.cxx
@@ -204,17 +204,20 @@ main (int argc, char* argv[])
 
     doc_s.add_no_namespace_schema ("people.xsd");
 
-    if (se = doc_s._error ())
+    se = doc_s._error ();
+    if (se)
       break;
 
     people_s.pre (*ppl);
 
-    if (se = people_s._error ())
+    se = people_s._error ();
+    if (se)
       break;
 
     doc_s.serialize (w, xml_schema::document_simpl::pretty_print);
 
-    if (se = doc_s._error ())
+    se = doc_s._error ();
+    if (se)
       break;
 
     people_s.post ();
diff --git a/examples/cxx/serializer/minimal/driver.cxx b/examples/cxx/serializer/minimal/driver.cxx
index 05e7de4..277b2e5 100644
--- a/examples/cxx/serializer/minimal/driver.cxx
+++ b/examples/cxx/serializer/minimal/driver.cxx
@@ -79,17 +79,20 @@ main ()
   {
     xml_schema::document_simpl doc_s (people_s, "people");
 
-    if (e = doc_s._error ())
+    e = doc_s._error ();
+    if (e)
       break;
 
     people_s.pre (p);
 
-    if (e = people_s._error ())
+    e = people_s._error ();
+    if (e)
       break;
 
     doc_s.serialize (w, xml_schema::document_simpl::pretty_print);
 
-    if (e = doc_s._error ())
+    e = doc_s._error ();
+    if (e)
       break;
 
     people_s.post ();
diff --git a/tests/cxx/hybrid/makefile b/tests/cxx/hybrid/makefile
index 27fab94..2de069f 100644
--- a/tests/cxx/hybrid/makefile
+++ b/tests/cxx/hybrid/makefile
@@ -7,7 +7,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
 
 tests := sequences
 
-ifeq ($(xsde_polymorphism),y)
+ifeq ($(xsde_polymorphic),y)
 tests += polymorphism
 endif
 
diff --git a/tests/cxx/hybrid/sequences/driver.cxx b/tests/cxx/hybrid/sequences/driver.cxx
index 45993be..441e73b 100644
--- a/tests/cxx/hybrid/sequences/driver.cxx
+++ b/tests/cxx/hybrid/sequences/driver.cxx
@@ -372,7 +372,7 @@ main ()
     s.push_back_copy ("bbb");
     s.push_back_copy ("ccc");
     delete[] s.detach (s.begin () + 1);
-    s.attach (s.begin () + 1, strdupc ("bbb"));
+    s.attach (s.begin () + 1, strdupx ("bbb"));
     assert (s[0] == string ("aaa") &&
             s[1] == string ("bbb") &&
             s[2] == string ("ccc"));
diff --git a/tests/cxx/parser/validation/built-in/long/driver.cxx b/tests/cxx/parser/validation/built-in/long/driver.cxx
index 0312b3b..eb183e6 100644
--- a/tests/cxx/parser/validation/built-in/long/driver.cxx
+++ b/tests/cxx/parser/validation/built-in/long/driver.cxx
@@ -14,7 +14,7 @@ using namespace xsde::cxx::parser;
 using namespace xsde::cxx::parser::validating;
 
 int
-main (int argc, char* argv[])
+main ()
 {
   // Good.
   //
diff --git a/xsde/cxx/serializer/driver-source.cxx b/xsde/cxx/serializer/driver-source.cxx
index 4a3c7db..ec58413 100644
--- a/xsde/cxx/serializer/driver-source.cxx
+++ b/xsde/cxx/serializer/driver-source.cxx
@@ -907,7 +907,8 @@ namespace CXX
            << endl;
 
       if (ctx.options.value<CLI::no_exceptions> ())
-        os << "if (e = doc_s._error ())" << endl
+        os << "e = doc_s._error ();"
+           << "if (e)" << endl
            << "break;"
            << endl;
 
@@ -920,7 +921,8 @@ namespace CXX
          << endl;
 
       if (ctx.options.value<CLI::no_exceptions> ())
-        os << "if (e = " << root_s << "._error ())" << endl
+        os << "e = " << root_s << "._error ();"
+           << "if (e)" << endl
            << "break;"
            << endl;
 
@@ -932,7 +934,8 @@ namespace CXX
            << endl;
 
       if (ctx.options.value<CLI::no_exceptions> ())
-        os << "if (e = doc_s._error ())" << endl
+        os << "e = doc_s._error ();"
+           << "if (e)" << endl
            << "break;"
            << endl;
 
-- 
cgit v1.1