merged main branch

[SVN r21511]
This commit is contained in:
John Maddock
2004-01-06 13:31:28 +00:00
parent 90531b094b
commit 278d4cdb86
3 changed files with 4 additions and 4 deletions

View File

@@ -33,7 +33,7 @@ int test()
std::isalpha(c);
std::ispunct(c);
#endif
std::strlen(&c);
(void)std::strlen(&c);
std::clock();
return 0;

View File

@@ -31,6 +31,6 @@
int cpp_main( int, char *[] )
{
return ::test();
return boost_function_scope_using_declaration_breaks_adl::test();
}

View File

@@ -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();
}