diff --git a/test/boost_no_auto_declarations.ipp b/test/boost_no_auto_declarations.ipp index be48ed3e..65410827 100644 --- a/test/boost_no_auto_declarations.ipp +++ b/test/boost_no_auto_declarations.ipp @@ -11,14 +11,14 @@ namespace boost_no_auto_declarations { -void check(int& x) +void check_f(int& x) { } int test() { auto x = 10; - check(x); + check_f(x); return 0; } diff --git a/test/boost_no_auto_multidecl.ipp b/test/boost_no_auto_multidecl.ipp index 976d445a..ea976612 100644 --- a/test/boost_no_auto_multidecl.ipp +++ b/test/boost_no_auto_multidecl.ipp @@ -11,14 +11,14 @@ namespace boost_no_auto_multideclarations { -void check(int& x, int*& y) +void check_f(int& x, int*& y) { } int test() { auto x = 10, *y = &x; - check(x, y); + check_f(x, y); return 0; } diff --git a/test/boost_no_com_value_init.ipp b/test/boost_no_com_value_init.ipp index 08e58823..a3a6c3ea 100644 --- a/test/boost_no_com_value_init.ipp +++ b/test/boost_no_com_value_init.ipp @@ -636,7 +636,7 @@ namespace boost_no_complete_value_initialization } // Returns the number of failures. - unsigned check() const + unsigned check_failures() const { const unsigned num_failures = FAILED_TO_VALUE_INITIALIZE(int_struct::data) + @@ -868,7 +868,7 @@ namespace boost_no_complete_value_initialization unsigned total_num_failures = 0; dirty_stack(); - const unsigned num_failures_of_a_temporary = value_initializer().check(); + const unsigned num_failures_of_a_temporary = value_initializer().check_failures(); total_num_failures += num_failures_of_a_temporary; if ( total_num_failures > 0 ) @@ -878,7 +878,7 @@ namespace boost_no_complete_value_initialization } dirty_stack(); value_initializer object_on_stack; - const unsigned num_failures_on_stack = object_on_stack.check(); + const unsigned num_failures_on_stack = object_on_stack.check_failures(); total_num_failures += num_failures_on_stack; if ( total_num_failures > 0 ) @@ -887,7 +887,7 @@ namespace boost_no_complete_value_initialization << num_failures_on_stack << std::endl; } const value_initializer* const ptr = new value_initializer(); - const unsigned num_failures_on_heap = ptr->check(); + const unsigned num_failures_on_heap = ptr->check_failures(); delete ptr; total_num_failures += num_failures_on_heap; diff --git a/test/boost_no_rtti.ipp b/test/boost_no_rtti.ipp index 69594722..dd8992bc 100644 --- a/test/boost_no_rtti.ipp +++ b/test/boost_no_rtti.ipp @@ -36,7 +36,7 @@ void B::t() namespace boost_no_rtti { -int check(const A& a) +int check_f(const A& a) { return typeid(a) == typeid(B) ? 0 : 1; } @@ -45,7 +45,7 @@ int test() { try{ B b; - return check(b); + return check_f(b); } catch(...) {