Get rid of warnings

2 files changed, 4 insertions, 2 deletions

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;