|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r62792 - in branches/release: boost/config/compiler boost/config/stdlib libs/config libs/config/test libs/config/test/all
From: john_at_[hidden]
Date: 2010-06-11 07:16:36
Author: johnmaddock
Date: 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
New Revision: 62792
URL: http://svn.boost.org/trac/boost/changeset/62792
Log:
Merge changes from Trunk - mostly new macro for <typeindex>.
Added:
branches/release/libs/config/test/boost_no_0x_hdr_typeindex.ipp
- copied unchanged from r62791, /trunk/libs/config/test/boost_no_0x_hdr_typeindex.ipp
branches/release/libs/config/test/no_0x_hdr_typeindex_fail.cpp
- copied unchanged from r62791, /trunk/libs/config/test/no_0x_hdr_typeindex_fail.cpp
branches/release/libs/config/test/no_0x_hdr_typeindex_pass.cpp
- copied unchanged from r62791, /trunk/libs/config/test/no_0x_hdr_typeindex_pass.cpp
Properties modified:
branches/release/libs/config/ (props changed)
Text files modified:
branches/release/boost/config/compiler/gcc_xml.hpp | 25 +++++++++++++++++++++++++
branches/release/boost/config/compiler/nvcc.hpp | 1 +
branches/release/boost/config/compiler/visualc.hpp | 2 ++
branches/release/boost/config/stdlib/dinkumware.hpp | 1 +
branches/release/boost/config/stdlib/libcomo.hpp | 1 +
branches/release/boost/config/stdlib/libstdcpp3.hpp | 1 +
branches/release/boost/config/stdlib/modena.hpp | 1 +
branches/release/boost/config/stdlib/msl.hpp | 1 +
branches/release/boost/config/stdlib/roguewave.hpp | 1 +
branches/release/boost/config/stdlib/sgi.hpp | 1 +
branches/release/boost/config/stdlib/stlport.hpp | 1 +
branches/release/boost/config/stdlib/vacpp.hpp | 1 +
branches/release/libs/config/test/all/Jamfile.v2 | 5 ++++-
branches/release/libs/config/test/config_info.cpp | 2 ++
branches/release/libs/config/test/config_test.cpp | 12 +++++++++++-
15 files changed, 54 insertions(+), 2 deletions(-)
Modified: branches/release/boost/config/compiler/gcc_xml.hpp
==============================================================================
--- branches/release/boost/config/compiler/gcc_xml.hpp (original)
+++ branches/release/boost/config/compiler/gcc_xml.hpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -25,6 +25,31 @@
//
#define BOOST_HAS_LONG_LONG
+// C++0x features:
+//
+# define BOOST_NO_CONSTEXPR
+# define BOOST_NO_NULLPTR
+# define BOOST_NO_TEMPLATE_ALIASES
+# define BOOST_NO_DECLTYPE
+# define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+# define BOOST_NO_RVALUE_REFERENCES
+# define BOOST_NO_STATIC_ASSERT
+# define BOOST_NO_VARIADIC_TEMPLATES
+# define BOOST_NO_AUTO_DECLARATIONS
+# define BOOST_NO_AUTO_MULTIDECLARATIONS
+# define BOOST_NO_CHAR16_T
+# define BOOST_NO_CHAR32_T
+# define BOOST_NO_DEFAULTED_FUNCTIONS
+# define BOOST_NO_DELETED_FUNCTIONS
+# define BOOST_NO_INITIALIZER_LISTS
+# define BOOST_NO_SCOPED_ENUMS
+# define BOOST_NO_SFINAE_EXPR
+# define BOOST_NO_SCOPED_ENUMS
+# define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+# define BOOST_NO_LAMBDAS
+# define BOOST_NO_RAW_LITERALS
+# define BOOST_NO_UNICODE_LITERALS
+
#define BOOST_COMPILER "GCC-XML C++ version " __GCCXML__
Modified: branches/release/boost/config/compiler/nvcc.hpp
==============================================================================
--- branches/release/boost/config/compiler/nvcc.hpp (original)
+++ branches/release/boost/config/compiler/nvcc.hpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -66,6 +66,7 @@
#define BOOST_NO_0X_HDR_TYPE_TRAITS
#define BOOST_NO_0X_HDR_TUPLE
#define BOOST_NO_0X_HDR_THREAD
+#define BOOST_NO_0X_HDR_TYPEINDEX
#define BOOST_NO_0X_HDR_SYSTEM_ERROR
#define BOOST_NO_0X_HDR_REGEX
#define BOOST_NO_0X_HDR_RATIO
Modified: branches/release/boost/config/compiler/visualc.hpp
==============================================================================
--- branches/release/boost/config/compiler/visualc.hpp (original)
+++ branches/release/boost/config/compiler/visualc.hpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -80,6 +80,8 @@
// although a conforming signature for swprint exists in VC7.1
// it appears not to actually work:
# define BOOST_NO_SWPRINTF
+// Our extern template tests also fail for this compiler:
+# define BOOST_NO_EXTERN_TEMPLATE
#endif
#if defined(UNDER_CE)
Modified: branches/release/boost/config/stdlib/dinkumware.hpp
==============================================================================
--- branches/release/boost/config/stdlib/dinkumware.hpp (original)
+++ branches/release/boost/config/stdlib/dinkumware.hpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -106,6 +106,7 @@
# define BOOST_NO_0X_HDR_UNORDERED_MAP
# define BOOST_NO_0X_HDR_UNORDERED_SET
# define BOOST_NO_0X_HDR_TUPLE
+# define BOOST_NO_0X_HDR_TYPEINDEX
#endif
#if !defined(_HAS_TR1_IMPORTS) && !defined(BOOST_NO_0X_HDR_TUPLE)
Modified: branches/release/boost/config/stdlib/libcomo.hpp
==============================================================================
--- branches/release/boost/config/stdlib/libcomo.hpp (original)
+++ branches/release/boost/config/stdlib/libcomo.hpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -54,6 +54,7 @@
# define BOOST_NO_0X_HDR_THREAD
# define BOOST_NO_0X_HDR_TUPLE
# define BOOST_NO_0X_HDR_TYPE_TRAITS
+# define BOOST_NO_0X_HDR_TYPEINDEX
# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_0X_HDR_UNORDERED_MAP
# define BOOST_NO_0X_HDR_UNORDERED_SET
Modified: branches/release/boost/config/stdlib/libstdcpp3.hpp
==============================================================================
--- branches/release/boost/config/stdlib/libstdcpp3.hpp (original)
+++ branches/release/boost/config/stdlib/libstdcpp3.hpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -123,5 +123,6 @@
# define BOOST_NO_0X_HDR_FUTURE
# define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
# define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
+# define BOOST_NO_0X_HDR_TYPEINDEX
// --- end ---
Modified: branches/release/boost/config/stdlib/modena.hpp
==============================================================================
--- branches/release/boost/config/stdlib/modena.hpp (original)
+++ branches/release/boost/config/stdlib/modena.hpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -43,6 +43,7 @@
# define BOOST_NO_0X_HDR_THREAD
# define BOOST_NO_0X_HDR_TUPLE
# define BOOST_NO_0X_HDR_TYPE_TRAITS
+# define BOOST_NO_0X_HDR_TYPEINDEX
# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_0X_HDR_UNORDERED_MAP
# define BOOST_NO_0X_HDR_UNORDERED_SET
Modified: branches/release/boost/config/stdlib/msl.hpp
==============================================================================
--- branches/release/boost/config/stdlib/msl.hpp (original)
+++ branches/release/boost/config/stdlib/msl.hpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -67,6 +67,7 @@
# define BOOST_NO_0X_HDR_THREAD
# define BOOST_NO_0X_HDR_TUPLE
# define BOOST_NO_0X_HDR_TYPE_TRAITS
+# define BOOST_NO_0X_HDR_TYPEINDEX
# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_0X_HDR_UNORDERED_MAP
# define BOOST_NO_0X_HDR_UNORDERED_SET
Modified: branches/release/boost/config/stdlib/roguewave.hpp
==============================================================================
--- branches/release/boost/config/stdlib/roguewave.hpp (original)
+++ branches/release/boost/config/stdlib/roguewave.hpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -173,6 +173,7 @@
# define BOOST_NO_0X_HDR_THREAD
# define BOOST_NO_0X_HDR_TUPLE
# define BOOST_NO_0X_HDR_TYPE_TRAITS
+# define BOOST_NO_0X_HDR_TYPEINDEX
# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_0X_HDR_UNORDERED_MAP
# define BOOST_NO_0X_HDR_UNORDERED_SET
Modified: branches/release/boost/config/stdlib/sgi.hpp
==============================================================================
--- branches/release/boost/config/stdlib/sgi.hpp (original)
+++ branches/release/boost/config/stdlib/sgi.hpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -126,6 +126,7 @@
# define BOOST_NO_0X_HDR_THREAD
# define BOOST_NO_0X_HDR_TUPLE
# define BOOST_NO_0X_HDR_TYPE_TRAITS
+# define BOOST_NO_0X_HDR_TYPEINDEX
# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_0X_HDR_UNORDERED_MAP
# define BOOST_NO_0X_HDR_UNORDERED_SET
Modified: branches/release/boost/config/stdlib/stlport.hpp
==============================================================================
--- branches/release/boost/config/stdlib/stlport.hpp (original)
+++ branches/release/boost/config/stdlib/stlport.hpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -221,6 +221,7 @@
# define BOOST_NO_0X_HDR_THREAD
# define BOOST_NO_0X_HDR_TUPLE
# define BOOST_NO_0X_HDR_TYPE_TRAITS
+# define BOOST_NO_0X_HDR_TYPEINDEX
# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_0X_HDR_UNORDERED_MAP
# define BOOST_NO_0X_HDR_UNORDERED_SET
Modified: branches/release/boost/config/stdlib/vacpp.hpp
==============================================================================
--- branches/release/boost/config/stdlib/vacpp.hpp (original)
+++ branches/release/boost/config/stdlib/vacpp.hpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -33,6 +33,7 @@
# define BOOST_NO_0X_HDR_THREAD
# define BOOST_NO_0X_HDR_TUPLE
# define BOOST_NO_0X_HDR_TYPE_TRAITS
+# define BOOST_NO_0X_HDR_TYPEINDEX
# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_0X_HDR_UNORDERED_MAP
# define BOOST_NO_0X_HDR_UNORDERED_SET
Modified: branches/release/libs/config/test/all/Jamfile.v2
==============================================================================
--- branches/release/libs/config/test/all/Jamfile.v2 (original)
+++ branches/release/libs/config/test/all/Jamfile.v2 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -1,7 +1,7 @@
#
# Regression test Jamfile for boost configuration setup.
# *** DO NOT EDIT THIS FILE BY HAND ***
-# This file was automatically generated on Fri Apr 09 12:24:54 2010
+# This file was automatically generated on Fri Jun 04 12:51:35 2010
# by libs/config/tools/generate.cpp
# Copyright John Maddock.
# Use, modification and distribution are subject to the
@@ -229,6 +229,9 @@
test-suite "BOOST_NO_0X_HDR_TUPLE" :
[ run ../no_0x_hdr_tuple_pass.cpp ]
[ compile-fail ../no_0x_hdr_tuple_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_TYPEINDEX" :
+[ run ../no_0x_hdr_typeindex_pass.cpp ]
+[ compile-fail ../no_0x_hdr_typeindex_fail.cpp ] ;
test-suite "BOOST_NO_0X_HDR_TYPE_TRAITS" :
[ run ../no_0x_hdr_type_traits_pass.cpp ]
[ compile-fail ../no_0x_hdr_type_traits_fail.cpp ] ;
Modified: branches/release/libs/config/test/config_info.cpp
==============================================================================
--- branches/release/libs/config/test/config_info.cpp (original)
+++ branches/release/libs/config/test/config_info.cpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -974,6 +974,7 @@
PRINT_MACRO(BOOST_NO_0X_HDR_SYSTEM_ERROR);
PRINT_MACRO(BOOST_NO_0X_HDR_THREAD);
PRINT_MACRO(BOOST_NO_0X_HDR_TUPLE);
+ PRINT_MACRO(BOOST_NO_0X_HDR_TYPEINDEX);
PRINT_MACRO(BOOST_NO_0X_HDR_TYPE_TRAITS);
PRINT_MACRO(BOOST_NO_0X_HDR_UNORDERED_MAP);
PRINT_MACRO(BOOST_NO_0X_HDR_UNORDERED_SET);
@@ -1082,6 +1083,7 @@
+
// END GENERATED BLOCK
PRINT_MACRO(BOOST_INTEL);
Modified: branches/release/libs/config/test/config_test.cpp
==============================================================================
--- branches/release/libs/config/test/config_test.cpp (original)
+++ branches/release/libs/config/test/config_test.cpp 2010-06-11 07:16:34 EDT (Fri, 11 Jun 2010)
@@ -1,4 +1,4 @@
-// This file was automatically generated on Fri Apr 09 12:24:54 2010
+// This file was automatically generated on Fri Jun 04 12:51:35 2010
// by libs/config/tools/generate.cpp
// Copyright John Maddock 2002-4.
// Use, modification and distribution are subject to the
@@ -112,6 +112,11 @@
#else
namespace boost_no_0x_hdr_tuple = empty_boost;
#endif
+#ifndef BOOST_NO_0X_HDR_TYPEINDEX
+#include "boost_no_0x_hdr_typeindex.ipp"
+#else
+namespace boost_no_0x_hdr_typeindex = empty_boost;
+#endif
#ifndef BOOST_NO_0X_HDR_TYPE_TRAITS
#include "boost_no_0x_hdr_type_traits.ipp"
#else
@@ -1196,6 +1201,11 @@
std::cerr << "Failed test for BOOST_NO_0X_HDR_TUPLE at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
+ if(0 != boost_no_0x_hdr_typeindex::test())
+ {
+ std::cerr << "Failed test for BOOST_NO_0X_HDR_TYPEINDEX at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ ++error_count;
+ }
if(0 != boost_no_0x_hdr_type_traits::test())
{
std::cerr << "Failed test for BOOST_NO_0X_HDR_TYPE_TRAITS at: " << __FILE__ << ":" << __LINE__ << std::endl;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk