Skip to content

Commit 63f8e9f

Browse files
committed
Merged revisions 41544-41546,41549-41551,41558-41561,41564,41567,41570,41573,41576-41579,41581,41583-41586,41589,41591,41594-41612,41614-41620,41622-41624,41628,41630-41635,41637,41640-41641,41643,41649-41650 via svnmerge from
https://svn.boost.org/svn/boost/trunk ........ r41544 | jhunold | 2007-12-01 20:27:06 +0100 (Sa, 01 Dez 2007) | 2 lines Silence compiler by adding cosmetic virtual destructors. ........ r41549 | jhunold | 2007-12-01 21:24:51 +0100 (Sa, 01 Dez 2007) | 2 lines Silence compiler by adding cosmetic virtual destructors. ........ r41550 | jhunold | 2007-12-01 21:26:37 +0100 (Sa, 01 Dez 2007) | 3 lines Remove unused paramters. Add -Wextra to gcc flags to enable more warnings. ........ r41577 | jhunold | 2007-12-02 12:51:08 +0100 (So, 02 Dez 2007) | 3 lines Revert revisions 41544 and 41549. See http://lists.boost.org/Archives/boost/2007/12/131116.php for details. ........ r41649 | jhunold | 2007-12-03 19:47:17 +0100 (Mo, 03 Dez 2007) | 2 lines Silence unused paramter warning in release mode. ........ r41650 | jhunold | 2007-12-03 19:51:26 +0100 (Mo, 03 Dez 2007) | 2 lines Add cosmetic virtual detructors to silence compile warnings. ........ [SVN r42094]
1 parent d9b4ada commit 63f8e9f

File tree

13 files changed

+20
-12
lines changed

13 files changed

+20
-12
lines changed

include/boost/python/converter/implicit.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ struct implicit
3232

3333
arg_from_python<Source> get_source(obj);
3434
bool convertible = get_source.convertible();
35-
BOOST_ASSERT(convertible);
35+
BOOST_VERIFY(convertible);
3636

3737
new (storage) Target(get_source());
3838

include/boost/python/detail/result.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ result(X const&, short = 0) { return 0; }
9595
# define N BOOST_PP_ITERATION()
9696

9797
template <class R BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class A)>
98-
boost::type<R>* result(R (*pf)(BOOST_PP_ENUM_PARAMS_Z(1, N, A)), int = 0)
98+
boost::type<R>* result(R (*)(BOOST_PP_ENUM_PARAMS_Z(1, N, A)), int = 0)
9999
{
100100
return 0;
101101
}
@@ -120,7 +120,7 @@ boost::type<R>* result(R (*pf)(BOOST_PP_ENUM_PARAMS_Z(1, N, A)), int = 0)
120120
# define Q BOOST_PYTHON_CV_QUALIFIER(BOOST_PP_RELATIVE_ITERATION(1))
121121

122122
template <class R, class T BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class A)>
123-
boost::type<R>* result(R (T::*pmf)(BOOST_PP_ENUM_PARAMS_Z(1, N, A)) Q, int = 0)
123+
boost::type<R>* result(R (T::*)(BOOST_PP_ENUM_PARAMS_Z(1, N, A)) Q, int = 0)
124124
{
125125
return 0;
126126
}

include/boost/python/detail/unwind_type.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ struct unwind_helper2<reference_to_pointer_>
149149
template <class Generator, class U>
150150
inline typename Generator::result_type
151151
#ifndef _MSC_VER
152-
unwind_type(boost::type<U>*p, Generator*)
152+
unwind_type(boost::type<U>*, Generator*)
153153
#else
154154
unwind_type(boost::type<U>*p =0, Generator* =0)
155155
#endif

include/boost/python/to_python_value.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ template <bool is_const_ref>
3636
struct object_manager_get_pytype
3737
{
3838
template <class U>
39-
static PyTypeObject const* get( U& (*p)() =0)
39+
static PyTypeObject const* get( U& (*)() =0)
4040
{
4141
return converter::object_manager_traits<U>::get_pytype();
4242
}
@@ -46,7 +46,7 @@ template <>
4646
struct object_manager_get_pytype<true>
4747
{
4848
template <class U>
49-
static PyTypeObject const* get( U const& (*p)() =0)
49+
static PyTypeObject const* get( U const& (*)() =0)
5050
{
5151
return converter::object_manager_traits<U>::get_pytype();
5252
}

test/Jamfile.v2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
import python ;
66

77
use-project /boost/python : ../build ;
8-
project /boost/python/test ;
8+
project /boost/python/test
9+
: requirements
10+
<toolset>gcc:<cxxflags>-Wextra
11+
;
912

1013
local PY = ;
1114
if [ python.configured ]

test/bienstman1.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ struct A {};
1111

1212
struct V
1313
{
14-
14+
virtual ~V() {}; // silence compiler warningsa
1515
virtual void f() = 0;
1616

1717
const A* inside() {return &a;}

test/bienstman3.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
struct V
99
{
10+
virtual ~V() {}; // silence compiler warningsa
1011
virtual void f() = 0;
1112
};
1213

test/borrowed.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
using namespace boost::python;
1010

1111
template <class T>
12-
void assert_borrowed_ptr(T const& x)
12+
void assert_borrowed_ptr(T const&)
1313
{
1414
BOOST_STATIC_ASSERT(boost::python::detail::is_borrowed_ptr<T>::value);
1515
}
1616

1717
template <class T>
18-
void assert_not_borrowed_ptr(T const& x)
18+
void assert_not_borrowed_ptr(T const&)
1919
{
2020
BOOST_STATIC_ASSERT(!boost::python::detail::is_borrowed_ptr<T>::value);
2121
}

test/implicit.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ X make_x(int n) { return X(n); }
2424
struct bar {};
2525
struct foo
2626
{
27+
virtual ~foo() {}; // silence compiler warnings
2728
virtual void f() = 0;
2829
operator bar() const { return bar(); }
2930
};

test/operators_wrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ struct vector
55
{
66
virtual ~vector() {}
77

8-
vector operator+( const vector& x ) const
8+
vector operator+( const vector& ) const
99
{ return vector(); }
1010

11-
vector& operator+=( const vector& x )
11+
vector& operator+=( const vector& )
1212
{ return *this; }
1313

1414
vector operator-() const

0 commit comments

Comments
 (0)