Subject: [Boost-commit] svn:boost r81791 - in trunk/boost/test: tools utils/runtime/cla utils/runtime/env
From: vicente.botet_at_[hidden]
Date: 2012-12-08 06:43:23
Author: viboes
Date: 2012-12-08 06:43:22 EST (Sat, 08 Dec 2012)
New Revision: 81791
URL: http://svn.boost.org/trac/boost/changeset/81791
Log:
Test: fix shared_ptr implicit conversion to bool introduced in [81780]
Text files modified:
trunk/boost/test/tools/assertion.hpp | 6 +++---
trunk/boost/test/utils/runtime/cla/parameter.hpp | 2 +-
trunk/boost/test/utils/runtime/env/variable.hpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
Modified: trunk/boost/test/tools/assertion.hpp
==============================================================================
--- trunk/boost/test/tools/assertion.hpp (original)
+++ trunk/boost/test/tools/assertion.hpp 2012-12-08 06:43:22 EST (Sat, 08 Dec 2012)
@@ -285,7 +285,7 @@
// Disabled operators
template<typename T>
ExprType&
- operator ||( T const& rhs )
+ operator ||( T const& )
{
BOOST_MPL_ASSERT_MSG(false, CANT_USE_LOGICAL_OPERATOR_OR_WITHIN_THIS_TESTING_TOOL, () );
@@ -294,7 +294,7 @@
template<typename T>
ExprType&
- operator &&( T const& rhs )
+ operator &&( T const& )
{
BOOST_MPL_ASSERT_MSG(false, CANT_USE_LOGICAL_OPERATOR_AND_WITHIN_THIS_TESTING_TOOL, () );
@@ -372,7 +372,7 @@
private:
template<typename U>
static void format_message( wrap_stringstream& ostr, U const& v ) { ostr << "(bool)" << v << " is false"; }
- static void format_message( wrap_stringstream& ostr, bool v ) {}
+ static void format_message( wrap_stringstream& , bool ) {}
// Data members
T m_value;
Modified: trunk/boost/test/utils/runtime/cla/parameter.hpp
==============================================================================
--- trunk/boost/test/utils/runtime/cla/parameter.hpp (original)
+++ trunk/boost/test/utils/runtime/cla/parameter.hpp 2012-12-08 06:43:22 EST (Sat, 08 Dec 2012)
@@ -78,7 +78,7 @@
}
// access methods
- bool has_argument() const { return m_actual_argument; }
+ bool has_argument() const { return m_actual_argument!=0; }
argument const& actual_argument() const { return *m_actual_argument; }
argument_ptr actual_argument() { return m_actual_argument; }
void reset() { m_actual_argument.reset(); }
Modified: trunk/boost/test/utils/runtime/env/variable.hpp
==============================================================================
--- trunk/boost/test/utils/runtime/env/variable.hpp (original)
+++ trunk/boost/test/utils/runtime/env/variable.hpp 2012-12-08 06:43:22 EST (Sat, 08 Dec 2012)
@@ -74,7 +74,7 @@
res.reset();
}
- bool has_value() const { return m_data->m_value; }
+ bool has_value() const { return m_data->m_value!=0; }
cstring name() const { return m_data->m_var_name; }
protected: