mirror of
https://github.com/boostorg/config.git
synced 2026-05-19 23:34:44 +02:00
Merge latest hash and unordered developments, and add support for initialiser
lists to config. Merged revisions 49338,49924-49927,49955,50029,50118 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r49338 | danieljames | 2008-10-15 10:44:41 +0100 (Wed, 15 Oct 2008) | 2 lines Revert [49229], it fixes the same problem as [48674]. ........ r49924 | danieljames | 2008-11-24 22:55:14 +0000 (Mon, 24 Nov 2008) | 1 line Extra tests for equality with different hash functions. ........ r49925 | danieljames | 2008-11-24 22:55:47 +0000 (Mon, 24 Nov 2008) | 1 line Document operator==/operator!= as undefined if the equality predicates aren't equivalent. ........ r49926 | danieljames | 2008-11-24 22:56:04 +0000 (Mon, 24 Nov 2008) | 1 line Use a larger prime number list. ........ r49927 | danieljames | 2008-11-24 23:15:55 +0000 (Mon, 24 Nov 2008) | 1 line Use aligned storage for the value. ........ r49955 | danieljames | 2008-11-27 11:42:13 +0000 (Thu, 27 Nov 2008) | 1 line Wild stab at getting destruction working on more compilers. ........ r50029 | danieljames | 2008-11-29 21:47:55 +0000 (Sat, 29 Nov 2008) | 1 line Workaround another in-place destruction. ........ r50118 | danieljames | 2008-12-04 21:30:19 +0000 (Thu, 04 Dec 2008) | 1 line Add support for initializer lists to config and the unordered containers. ........ [SVN r50451]
This commit is contained in:
+4
-1
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# Regression test Jamfile for boost configuration setup.
|
||||
# *** DO NOT EDIT THIS FILE BY HAND ***
|
||||
# This file was automatically generated on Sat Sep 20 09:49:52 2008
|
||||
# This file was automatically generated on Wed Sep 24 11:44:22 2008
|
||||
# by libs/config/tools/generate.cpp
|
||||
# Copyright John Maddock.
|
||||
# Use, modification and distribution are subject to the
|
||||
@@ -232,6 +232,9 @@ test-suite "BOOST_NO_FUNCTION_TEMPLATE_ORDERING" :
|
||||
test-suite "BOOST_NO_MS_INT64_NUMERIC_LIMITS" :
|
||||
[ run ../no_i64_limits_pass.cpp ]
|
||||
[ compile-fail ../no_i64_limits_fail.cpp ] ;
|
||||
test-suite "BOOST_NO_INITIALIZER_LISTS" :
|
||||
[ run ../no_initializer_lists_pass.cpp ]
|
||||
[ compile-fail ../no_initializer_lists_fail.cpp ] ;
|
||||
test-suite "BOOST_NO_INCLASS_MEMBER_INITIALIZATION" :
|
||||
[ run ../no_inline_memb_init_pass.cpp ]
|
||||
[ compile-fail ../no_inline_memb_init_fail.cpp ] ;
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
// (C) Copyright Daniel James 2008.
|
||||
// Use, modification and distribution are subject to the
|
||||
// Boost Software License, Version 1.0. (See accompanying file
|
||||
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
// See http://www.boost.org/libs/config for most recent version.
|
||||
|
||||
|
||||
// MACRO: BOOST_NO_INITIALIZER_LISTS
|
||||
// TITLE: Initializer Lists
|
||||
// DESCRIPTION: If the compiler does not support C++0x initializer lists
|
||||
|
||||
#include <initializer_list>
|
||||
|
||||
namespace boost_no_initializer_lists {
|
||||
|
||||
int test()
|
||||
{
|
||||
std::initializer_list<int> x = { 1, 2 };
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -969,6 +969,7 @@ void print_boost_macros()
|
||||
PRINT_MACRO(BOOST_NO_FUNCTION_TEMPLATE_ORDERING);
|
||||
PRINT_MACRO(BOOST_NO_FUNCTION_TYPE_SPECIALIZATIONS);
|
||||
PRINT_MACRO(BOOST_NO_INCLASS_MEMBER_INITIALIZATION);
|
||||
PRINT_MACRO(BOOST_NO_INITIALIZER_LISTS);
|
||||
PRINT_MACRO(BOOST_NO_INTEGRAL_INT64_T);
|
||||
PRINT_MACRO(BOOST_NO_INTRINSIC_WCHAR_T);
|
||||
PRINT_MACRO(BOOST_NO_IOSFWD);
|
||||
@@ -1039,6 +1040,7 @@ void print_boost_macros()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// END GENERATED BLOCK
|
||||
|
||||
+11
-1
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Sat Sep 20 09:49:52 2008
|
||||
// This file was automatically generated on Wed Sep 24 11:44:22 2008
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-4.
|
||||
// Use, modification and distribution are subject to the
|
||||
@@ -117,6 +117,11 @@ namespace boost_no_function_template_ordering = empty_boost;
|
||||
#else
|
||||
namespace boost_no_ms_int64_numeric_limits = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_INITIALIZER_LISTS
|
||||
#include "boost_no_initializer_lists.ipp"
|
||||
#else
|
||||
namespace boost_no_initializer_lists = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION
|
||||
#include "boost_no_inline_memb_init.ipp"
|
||||
#else
|
||||
@@ -966,6 +971,11 @@ int main( int, char *[] )
|
||||
std::cerr << "Failed test for BOOST_NO_MS_INT64_NUMERIC_LIMITS at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_initializer_lists::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_INITIALIZER_LISTS at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_inclass_member_initialization::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_INCLASS_MEMBER_INITIALIZATION at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
// This file was automatically generated on Wed Sep 24 11:44:21 2008
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-4.
|
||||
// Use, modification and distribution are subject to the
|
||||
// Boost Software License, Version 1.0. (See accompanying file
|
||||
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
// See http://www.boost.org/libs/config for the most recent version.//
|
||||
// Revision $Id$
|
||||
//
|
||||
|
||||
|
||||
// Test file for macro BOOST_NO_INITIALIZER_LISTS
|
||||
// This file should not compile, if it does then
|
||||
// BOOST_NO_INITIALIZER_LISTS should not be defined.
|
||||
// See file boost_no_initializer_lists.ipp for details
|
||||
|
||||
// Must not have BOOST_ASSERT_CONFIG set; it defeats
|
||||
// the objective of this file:
|
||||
#ifdef BOOST_ASSERT_CONFIG
|
||||
# undef BOOST_ASSERT_CONFIG
|
||||
#endif
|
||||
|
||||
#include <boost/config.hpp>
|
||||
#include "test.hpp"
|
||||
|
||||
#ifdef BOOST_NO_INITIALIZER_LISTS
|
||||
#include "boost_no_initializer_lists.ipp"
|
||||
#else
|
||||
#error "this file should not compile"
|
||||
#endif
|
||||
|
||||
int main( int, char *[] )
|
||||
{
|
||||
return boost_no_initializer_lists::test();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
// This file was automatically generated on Wed Sep 24 11:44:21 2008
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-4.
|
||||
// Use, modification and distribution are subject to the
|
||||
// Boost Software License, Version 1.0. (See accompanying file
|
||||
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
// See http://www.boost.org/libs/config for the most recent version.//
|
||||
// Revision $Id$
|
||||
//
|
||||
|
||||
|
||||
// Test file for macro BOOST_NO_INITIALIZER_LISTS
|
||||
// This file should compile, if it does not then
|
||||
// BOOST_NO_INITIALIZER_LISTS should be defined.
|
||||
// See file boost_no_initializer_lists.ipp for details
|
||||
|
||||
// Must not have BOOST_ASSERT_CONFIG set; it defeats
|
||||
// the objective of this file:
|
||||
#ifdef BOOST_ASSERT_CONFIG
|
||||
# undef BOOST_ASSERT_CONFIG
|
||||
#endif
|
||||
|
||||
#include <boost/config.hpp>
|
||||
#include "test.hpp"
|
||||
|
||||
#ifndef BOOST_NO_INITIALIZER_LISTS
|
||||
#include "boost_no_initializer_lists.ipp"
|
||||
#else
|
||||
namespace boost_no_initializer_lists = empty_boost;
|
||||
#endif
|
||||
|
||||
int main( int, char *[] )
|
||||
{
|
||||
return boost_no_initializer_lists::test();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user