Merge changes from Trunk.

[SVN r50531]
This commit is contained in:
John Maddock
2009-01-10 11:18:42 +00:00
parent 63ec21a0d6
commit 40c8299a25
28 changed files with 236 additions and 43 deletions
+11 -1
View File
@@ -1,4 +1,4 @@
// This file was automatically generated on Wed Sep 24 11:44:22 2008
// This file was automatically generated on Tue Dec 16 16:41:41 2008
// by libs/config/tools/generate.cpp
// Copyright John Maddock 2002-4.
// Use, modification and distribution are subject to the
@@ -292,6 +292,11 @@ namespace boost_no_std_output_iterator_assign = empty_boost;
#else
namespace boost_no_std_typeinfo = empty_boost;
#endif
#ifndef BOOST_NO_STD_UNORDERED
#include "boost_no_std_unordered.ipp"
#else
namespace boost_no_std_unordered = empty_boost;
#endif
#ifndef BOOST_NO_STD_USE_FACET
#include "boost_no_std_use_facet.ipp"
#else
@@ -1146,6 +1151,11 @@ int main( int, char *[] )
std::cerr << "Failed test for BOOST_NO_STD_TYPEINFO at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_std_unordered::test())
{
std::cerr << "Failed test for BOOST_NO_STD_UNORDERED at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_std_use_facet::test())
{
std::cerr << "Failed test for BOOST_NO_STD_USE_FACET at: " << __FILE__ << ":" << __LINE__ << std::endl;