Merged recent changes from trunk.

[SVN r85088]
This commit is contained in:
Andrey Semashev
2013-07-20 17:17:10 +00:00
parent 36502dd372
commit abe73ce723
79 changed files with 880 additions and 242 deletions

View File

@@ -27,11 +27,11 @@
#ifndef BOOST_NO_CXX11_CONSTEXPR
#include "boost_no_constexpr.ipp"
#else
namespace boost_no_constexpr = empty_boost;
namespace boost_no_cxx11_constexpr = empty_boost;
#endif
int main( int, char *[] )
{
return boost_no_constexpr::test();
return boost_no_cxx11_constexpr::test();
}