merge [72327] from trunk

[SVN r73153]
This commit is contained in:
Eric Niebler committed 2011-07-16 20:12:46 +00:00
1 parent 0bcba7df38
commit 18be7dcf00
28 files changed
+405 -129

No files matched your search

+11 -1
View File
@@ -1,4 +1,4 @@
// This file was automatically generated on Mon May 09 12:11:18 2011
// This file was automatically generated on Wed Jun 1 21:44:56 2011
// by libs/config/tools/generate.cpp
// Copyright John Maddock 2002-4.
// Use, modification and distribution are subject to the
@@ -197,6 +197,11 @@ namespace boost_no_cwctype = empty_boost;
#else
namespace boost_no_decltype = empty_boost;
#endif
#ifndef BOOST_NO_DECLTYPE_N3276
#include "boost_no_decltype_n3276.ipp"
#else
namespace boost_no_decltype_n3276 = empty_boost;
#endif
#ifndef BOOST_DEDUCED_TYPENAME
#include "boost_no_ded_typename.ipp"
#else
@@ -1276,6 +1281,11 @@ int main( int, char *[] )
std::cerr << "Failed test for BOOST_NO_DECLTYPE at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_decltype_n3276::test())
{
std::cerr << "Failed test for BOOST_NO_DECLTYPE_N3276 at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_deduced_typename::test())
{
std::cerr << "Failed test for BOOST_DEDUCED_TYPENAME at: " << __FILE__ << ":" << __LINE__ << std::endl;