diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2009-04-08 09:52:03 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2009-04-08 09:52:03 +0200 |
| commit | 2c4652262c256ec99d1dcbff77038f561fb1b738 (patch) | |
| tree | 996d15ea6a052144d47647ec775234b4baf5e496 | |
| parent | 086b2bc1d5d189152b975e274351927b09a9fd79 (diff) | |
Get rid of warnings
| -rw-r--r-- | examples/cxx/hybrid/binary/custom/makefile | 3 | ||||
| -rw-r--r-- | tests/cxx/hybrid/binary/custom/makefile | 3 | ||||
| -rw-r--r-- | tests/cxx/hybrid/binary/xdr/driver.cxx | 3 | ||||
| -rw-r--r-- | xsde/cxx/hybrid/default-value.cxx | 4 | ||||
| -rw-r--r-- | xsde/cxx/hybrid/serializer-source.cxx | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/examples/cxx/hybrid/binary/custom/makefile b/examples/cxx/hybrid/binary/custom/makefile index 7ab91d0..51fafa5 100644 --- a/examples/cxx/hybrid/binary/custom/makefile +++ b/examples/cxx/hybrid/binary/custom/makefile @@ -54,7 +54,8 @@ $(out_base)/xml-schema-pskel%hxx \ $(out_base)/xml-schema-sskel%hxx: $(out_root)/xsde/xsde $(call message,xsde $(src_base)/xml-schema.xsd,\ $(out_root)/xsde/xsde cxx-hybrid --output-dir $(out_base) \ ---generate-xml-schema --generate-parser --generate-serializer xml-schema.xsd) +--generate-xml-schema --generate-parser --generate-serializer \ +$(xsde_options) xml-schema.xsd) genf += xml-schema.hxx xml-schema-pskel.hxx xml-schema-sskel.hxx diff --git a/tests/cxx/hybrid/binary/custom/makefile b/tests/cxx/hybrid/binary/custom/makefile index 50fe420..8675470 100644 --- a/tests/cxx/hybrid/binary/custom/makefile +++ b/tests/cxx/hybrid/binary/custom/makefile @@ -54,7 +54,8 @@ $(out_base)/xml-schema-pskel%hxx \ $(out_base)/xml-schema-sskel%hxx: $(out_root)/xsde/xsde $(call message,xsde $(src_base)/xml-schema.xsd,\ $(out_root)/xsde/xsde cxx-hybrid --output-dir $(out_base) \ ---generate-xml-schema --generate-parser --generate-serializer xml-schema.xsd) +--generate-xml-schema --generate-parser --generate-serializer \ +$(xsde_options) xml-schema.xsd) genf += xml-schema.hxx xml-schema-pskel.hxx xml-schema-sskel.hxx diff --git a/tests/cxx/hybrid/binary/xdr/driver.cxx b/tests/cxx/hybrid/binary/xdr/driver.cxx index a8a3010..dc776f2 100644 --- a/tests/cxx/hybrid/binary/xdr/driver.cxx +++ b/tests/cxx/hybrid/binary/xdr/driver.cxx @@ -41,9 +41,10 @@ struct underflow_info }; extern "C" int -underflow (char* p, char* buf, int n) +underflow (char* p, char* buf, int n_) { underflow_info* ui (reinterpret_cast<underflow_info*> (p)); + size_t n (static_cast<size_t> (n_)); size_t size (ui->buf->size () - ui->pos); n = size > n ? n : size; diff --git a/xsde/cxx/hybrid/default-value.cxx b/xsde/cxx/hybrid/default-value.cxx index 895c764..8c570cf 100644 --- a/xsde/cxx/hybrid/default-value.cxx +++ b/xsde/cxx/hybrid/default-value.cxx @@ -64,7 +64,7 @@ namespace CXX { Size n (s.size ()), i (0); - if (n > 0 && s[i] == '-' || s[i] == '+') + if (n > 0 && (s[i] == '-' || s[i] == '+')) i++; Size j (i); @@ -1200,7 +1200,7 @@ namespace CXX } Void CompareValue:: - traverse (SemanticGraph::Type& t) + traverse (SemanticGraph::Type&) { // This is a fall-back case where we handle all other types. // diff --git a/xsde/cxx/hybrid/serializer-source.cxx b/xsde/cxx/hybrid/serializer-source.cxx index b0c194e..b035246 100644 --- a/xsde/cxx/hybrid/serializer-source.cxx +++ b/xsde/cxx/hybrid/serializer-source.cxx @@ -1239,7 +1239,7 @@ namespace CXX os << "::_reset ();"; os << "for (; !this->" << state << ".empty (); " << - "this->" << state << ".pop ());"; + "this->" << state << ".pop ()) ;"; // Space is for g++-4.3. os << "}"; } |