GCC Warning Suppression

dabrahams · dabrahams · commit 6ffeca641c60 · 2009-06-05T20:15:01.000Z
[SVN r53659]
diff --git a/include/boost/python/detail/decorated_type_id.hpp b/include/boost/python/detail/decorated_type_id.hpp
@@ -55,8 +55,8 @@ inline decorated_type_info::decorated_type_info(type_info base_t, decoration dec
 inline bool decorated_type_info::operator<(decorated_type_info const& rhs) const
 {
     return m_decoration < rhs.m_decoration
-        || m_decoration == rhs.m_decoration
-           && m_base_type < rhs.m_base_type;
+      || (m_decoration == rhs.m_decoration
+          && m_base_type < rhs.m_base_type);
 }
 
 inline bool decorated_type_info::operator==(decorated_type_info const& rhs) const
diff --git a/src/object/class.cpp b/src/object/class.cpp
@@ -506,13 +506,12 @@ namespace objects
       // Build a tuple of the base Python type objects. If no bases
       // were declared, we'll use our class_type() as the single base
       // class.
-      std::size_t const num_bases = (std::max)(num_types - 1, static_cast<std::size_t>(1));
-      assert(num_bases <= ssize_t_max);
-      handle<> bases(PyTuple_New(static_cast<ssize_t>(num_bases)));
+      ssize_t const num_bases = (std::max)(num_types - 1, static_cast<std::size_t>(1));
+      handle<> bases(PyTuple_New(num_bases));
 
-      for (std::size_t i = 1; i <= num_bases; ++i)
+      for (ssize_t i = 1; i <= num_bases; ++i)
       {
-          type_handle c = (i >= num_types) ? class_type() : get_class(types[i]);
+          type_handle c = (i >= static_cast<ssize_t>(num_types)) ? class_type() : get_class(types[i]);
           // PyTuple_SET_ITEM steals this reference
           PyTuple_SET_ITEM(bases.get(), static_cast<ssize_t>(i - 1), upcast<PyObject>(c.release()));
       }
diff --git a/src/object/function.cpp b/src/object/function.cpp
@@ -166,7 +166,7 @@ PyObject* function::call(PyObject* args, PyObject* keywords) const
                     else
                     {
                         // build a new arg tuple, will adjust its size later
-                        assert(max_arity <= ssize_t_max);
+                        assert(max_arity <= static_cast<std::size_t>(ssize_t_max));
                         inner_args = handle<>(
                             PyTuple_New(static_cast<ssize_t>(max_arity)));
 
diff --git a/src/object/function_doc_signature.cpp b/src/object/function_doc_signature.cpp
@@ -52,9 +52,9 @@ namespace boost { namespace python { namespace objects {
             //check if the argument default values are the same
             bool f1_has_names = bool(f1->m_arg_names);
             bool f2_has_names = bool(f2->m_arg_names);
-            if ( f1_has_names && f2_has_names && f2->m_arg_names[i-1]!=f1->m_arg_names[i-1]
-                || f1_has_names && !f2_has_names
-                || !f1_has_names && f2_has_names && f2->m_arg_names[i-1]!=python::object()
+            if ( (f1_has_names && f2_has_names && f2->m_arg_names[i-1]!=f1->m_arg_names[i-1])
+                 || (f1_has_names && !f2_has_names)
+                 || (!f1_has_names && f2_has_names && f2->m_arg_names[i-1]!=python::object())
                 )
                 return false;
         }
diff --git a/src/str.cpp b/src/str.cpp
@@ -26,7 +26,7 @@ namespace {
 
     ssize_t str_size_as_py_ssize_t(std::size_t n)
     {
-      if (n > ssize_t_max)
+      if (n > static_cast<std::size_t>(ssize_t_max))
       {
           throw std::range_error("str size > ssize_t_max");
       }

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ inline decorated_type_info::decorated_type_info(type_info base_t, decoration dec`
`55`	`55`	`inline bool decorated_type_info::operator<(decorated_type_info const& rhs) const`
`56`	`56`	`{`
`57`	`57`	`return m_decoration < rhs.m_decoration`
`58`		`- \|\| m_decoration == rhs.m_decoration`
`59`		`- && m_base_type < rhs.m_base_type;`
	`58`	`+ \|\| (m_decoration == rhs.m_decoration`
	`59`	`+ && m_base_type < rhs.m_base_type);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`inline bool decorated_type_info::operator==(decorated_type_info const& rhs) const`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ PyObject* function::call(PyObject* args, PyObject* keywords) const`
`166`	`166`	`else`
`167`	`167`	`{`
`168`	`168`	`// build a new arg tuple, will adjust its size later`
`169`		`- assert(max_arity <= ssize_t_max);`
	`169`	`+ assert(max_arity <= static_cast<std::size_t>(ssize_t_max));`
`170`	`170`	`inner_args = handle<>(`
`171`	`171`	`PyTuple_New(static_cast<ssize_t>(max_arity)));`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,9 @@ namespace boost { namespace python { namespace objects {`
`52`	`52`	`//check if the argument default values are the same`
`53`	`53`	`bool f1_has_names = bool(f1->m_arg_names);`
`54`	`54`	`bool f2_has_names = bool(f2->m_arg_names);`
`55`		`- if ( f1_has_names && f2_has_names && f2->m_arg_names[i-1]!=f1->m_arg_names[i-1]`
`56`		`- \|\| f1_has_names && !f2_has_names`
`57`		`- \|\| !f1_has_names && f2_has_names && f2->m_arg_names[i-1]!=python::object()`
	`55`	`+ if ( (f1_has_names && f2_has_names && f2->m_arg_names[i-1]!=f1->m_arg_names[i-1])`
	`56`	`+ \|\| (f1_has_names && !f2_has_names)`
	`57`	`+ \|\| (!f1_has_names && f2_has_names && f2->m_arg_names[i-1]!=python::object())`
`58`	`58`	`)`
`59`	`59`	`return false;`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace {`
`26`	`26`
`27`	`27`	`ssize_t str_size_as_py_ssize_t(std::size_t n)`
`28`	`28`	`{`
`29`		`- if (n > ssize_t_max)`
	`29`	`+ if (n > static_cast<std::size_t>(ssize_t_max))`
`30`	`30`	`{`
`31`	`31`	`throw std::range_error("str size > ssize_t_max");`
`32`	`32`	`}`