avoid g++ -Wall -W "unused parameter" warnings

Ralf W. Grosse-Kunstleve · Ralf W. Grosse-Kunstleve · commit 0519d542297f · 2006-01-22T19:29:32.000Z
[SVN r32373]
diff --git a/test/back_reference.cpp b/test/back_reference.cpp
@@ -41,17 +41,17 @@ int X::counter;
 
 struct Y : X
 {
-    Y(PyObject* self, int x) : X(x) {};
-    Y(PyObject* self, Y const& rhs) : X(rhs), self(self) {};
+    Y(PyObject* self, int x) : X(x), self(self) {}
+    Y(PyObject* self, Y const& rhs) : X(rhs), self(self) {}
  private:
     Y(Y const&);
     PyObject* self;
 };
 
 struct Z : X
 {
-    Z(PyObject* self, int x) : X(x) {};
-    Z(PyObject* self, Z const& rhs) : X(rhs), self(self) {};
+    Z(PyObject* self, int x) : X(x), self(self) {}
+    Z(PyObject* self, Z const& rhs) : X(rhs), self(self) {}
  private:
     Z(Z const&);
     PyObject* self;
diff --git a/test/cltree.cpp b/test/cltree.cpp
@@ -36,20 +36,20 @@ class variable: public basic {
 
 class symbol_wrapper: public symbol {
 public:
-  symbol_wrapper(PyObject* self): symbol() { 
+  symbol_wrapper(PyObject* /*self*/): symbol() { 
     name = "cltree.wrapped_symbol"; 
   }
 };
 
 class variable_wrapper: public variable {
 public:
-  variable_wrapper(PyObject* self): variable() { 
+  variable_wrapper(PyObject* /*self*/): variable() { 
     name = "cltree.wrapped_variable";
   }
 
   // This constructor is introduced only because cannot use
   // boost::noncopyable, see below.
-  variable_wrapper(PyObject* self,variable v): variable(v) {} 
+  variable_wrapper(PyObject* /*self*/,variable v): variable(v) {} 
 
 };
 
diff --git a/test/exception_translator.cpp b/test/exception_translator.cpp
@@ -7,7 +7,7 @@
 
 struct error {};
 
-void translate(error const& e)
+void translate(error const& /*e*/)
 {
     PyErr_SetString(PyExc_RuntimeError, "!!!error!!!");
 }
diff --git a/test/extract.cpp b/test/extract.cpp
@@ -29,8 +29,9 @@ boost::python::list extract_list(object x)
     // Make sure we always have the right idea about whether it's a list
     bool is_list_1 = get_list.check();
     bool is_list_2 = PyObject_IsInstance(x.ptr(), (PyObject*)&PyList_Type);
-    assert(is_list_1 == is_list_2);
-    
+    if (is_list_1 != is_list_2) {
+        throw std::runtime_error("is_list_1 == is_list_2 failure.");
+    }
     return get_list();
 }
 
@@ -131,7 +132,9 @@ BOOST_PYTHON_MODULE(extract_ext)
 
     // Get the C++ object out of the Python object
     X const& x = extract<X&>(x_obj);
-    assert(x.value() == 3);
+    if (x.value() != 3) {
+        throw std::runtime_error("x.value() == 3 failure.");
+    }
 }
 
 
diff --git a/test/numpy.cpp b/test/numpy.cpp
@@ -23,7 +23,7 @@ object new_array()
 }
 
 // test argument conversion
-void take_array(numeric::array x)
+void take_array(numeric::array /*x*/)
 {
 }
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`struct error {};`
`9`	`9`
`10`		`-void translate(error const& e)`
	`10`	`+void translate(error const& /e/)`
`11`	`11`	`{`
`12`	`12`	`PyErr_SetString(PyExc_RuntimeError, "!!!error!!!");`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ object new_array()`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`// test argument conversion`
`26`		`-void take_array(numeric::array x)`
	`26`	`+void take_array(numeric::array /x/)`
`27`	`27`	`{`
`28`	`28`	`}`
`29`	`29`