From 278d4cdb86adb4ed76ce1cd925c20a5c5b4f689d Mon Sep 17 00:00:00 2001 From: John Maddock Date: Tue, 6 Jan 2004 13:31:28 +0000 Subject: [PATCH] merged main branch [SVN r21511] --- test/boost_no_stdc_namespace.ipp | 2 +- test/no_using_breaks_adl_fail.cpp | 2 +- test/no_using_breaks_adl_pass.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/boost_no_stdc_namespace.ipp b/test/boost_no_stdc_namespace.ipp index f105b2fe..993aec74 100644 --- a/test/boost_no_stdc_namespace.ipp +++ b/test/boost_no_stdc_namespace.ipp @@ -33,7 +33,7 @@ int test() std::isalpha(c); std::ispunct(c); #endif - std::strlen(&c); + (void)std::strlen(&c); std::clock(); return 0; diff --git a/test/no_using_breaks_adl_fail.cpp b/test/no_using_breaks_adl_fail.cpp index 719c517b..25d28ec3 100644 --- a/test/no_using_breaks_adl_fail.cpp +++ b/test/no_using_breaks_adl_fail.cpp @@ -31,6 +31,6 @@ int cpp_main( int, char *[] ) { - return ::test(); + return boost_function_scope_using_declaration_breaks_adl::test(); } diff --git a/test/no_using_breaks_adl_pass.cpp b/test/no_using_breaks_adl_pass.cpp index 23110b65..a6c28905 100644 --- a/test/no_using_breaks_adl_pass.cpp +++ b/test/no_using_breaks_adl_pass.cpp @@ -26,11 +26,11 @@ #ifndef BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL #include "boost_no_using_breaks_adl.cxx" #else -namespace = empty_boost; +namespace boost_function_scope_using_declaration_breaks_adl = empty_boost; #endif int cpp_main( int, char *[] ) { - return ::test(); + return boost_function_scope_using_declaration_breaks_adl::test(); }