config: merge trunk

[SVN r56776]
This commit is contained in:
Beman Dawes
2009-10-13 12:56:44 +00:00
parent 3d32b20f45
commit d9ea70034c
5 changed files with 7 additions and 7 deletions

View File

@@ -112,6 +112,7 @@
#define BOOST_NO_NULLPTR #define BOOST_NO_NULLPTR
#define BOOST_NO_RAW_LITERALS #define BOOST_NO_RAW_LITERALS
#define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_TEMPLATE_ALIASES
#define BOOST_NO_UNICODE_LITERALS
// C++0x features in 4.3.n and later // C++0x features in 4.3.n and later
// //
@@ -149,7 +150,6 @@
# define BOOST_NO_DELETED_FUNCTIONS # define BOOST_NO_DELETED_FUNCTIONS
# define BOOST_NO_INITIALIZER_LISTS # define BOOST_NO_INITIALIZER_LISTS
# define BOOST_NO_SCOPED_ENUMS # define BOOST_NO_SCOPED_ENUMS
# define BOOST_NO_UNICODE_LITERALS
#endif #endif
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4) #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4)

View File

@@ -1,7 +1,7 @@
# #
# Regression test Jamfile for boost configuration setup. # Regression test Jamfile for boost configuration setup.
# *** DO NOT EDIT THIS FILE BY HAND *** # *** DO NOT EDIT THIS FILE BY HAND ***
# This file was automatically generated on Sun Aug 02 08:26:00 2009 # This file was automatically generated on Sun Oct 11 13:04:18 2009
# by libs/config/tools/generate.cpp # by libs/config/tools/generate.cpp
# Copyright John Maddock. # Copyright John Maddock.
# Use, modification and distribution are subject to the # Use, modification and distribution are subject to the

View File

@@ -8,15 +8,14 @@
// MACRO: BOOST_NO_UNICODE_LITERALS // MACRO: BOOST_NO_UNICODE_LITERALS
// TITLE: C++0x unicode literals unavailable // TITLE: C++0x unicode literals unavailable
// DESCRIPTION: The compiler does not support C++0x unicode literals // DESCRIPTION: The compiler does not support C++0x Unicode literals (N2442)
namespace boost_no_unicode_literals { namespace boost_no_unicode_literals {
int test() int test()
{ {
const char* u8 = u8""; const char* c8 = u8"";
const char16_t* u16 = u"";
const char32_t* u32 = U"";
return 0; return 0;
} }

View File

@@ -1079,6 +1079,7 @@ void print_boost_macros()
// END GENERATED BLOCK // END GENERATED BLOCK
PRINT_MACRO(BOOST_INTEL); PRINT_MACRO(BOOST_INTEL);

View File

@@ -1,4 +1,4 @@
// This file was automatically generated on Sun Aug 02 08:26:00 2009 // This file was automatically generated on Sun Oct 11 13:04:18 2009
// by libs/config/tools/generate.cpp // by libs/config/tools/generate.cpp
// Copyright John Maddock 2002-4. // Copyright John Maddock 2002-4.
// Use, modification and distribution are subject to the // Use, modification and distribution are subject to the