forked from boostorg/config
Merge Boost.Config changes ready for 1.37.
[SVN r48892]
This commit is contained in:
1 parent
fbef3e88e5
commit
b47cfe8c7b
22 files changed
+471
-71
No files matched your search
+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 Jul 12 12:39:35 2008
|
||||
# This file was automatically generated on Mon Aug 25 10:51:52 2008
|
||||
# by libs/config/tools/generate.cpp
|
||||
# Copyright John Maddock.
|
||||
# Use, modification and distribution are subject to the
|
||||
@@ -292,6 +292,9 @@ test-suite "BOOST_NO_POINTER_TO_MEMBER_CONST" :
|
||||
test-suite "BOOST_NO_UNREACHABLE_RETURN_DETECTION" :
|
||||
[ run ../no_ret_det_pass.cpp ]
|
||||
[ compile-fail ../no_ret_det_fail.cpp ] ;
|
||||
test-suite "BOOST_NO_RTTI" :
|
||||
[ run ../no_rtti_pass.cpp ]
|
||||
[ compile-fail ../no_rtti_fail.cpp ] ;
|
||||
test-suite "BOOST_NO_SFINAE" :
|
||||
[ run ../no_sfinae_pass.cpp ]
|
||||
[ compile-fail ../no_sfinae_fail.cpp ] ;
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
// (C) Copyright John Maddock 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_RTTI
|
||||
// TITLE: RTTI unavailable
|
||||
// DESCRIPTION: The compiler does not support RTTI in this mode
|
||||
|
||||
#include <typeinfo>
|
||||
|
||||
class A
|
||||
{
|
||||
public:
|
||||
A(){}
|
||||
virtual void t();
|
||||
};
|
||||
|
||||
void A::t()
|
||||
{
|
||||
}
|
||||
|
||||
class B : public A
|
||||
{
|
||||
public:
|
||||
B(){}
|
||||
virtual void t();
|
||||
};
|
||||
|
||||
void B::t()
|
||||
{
|
||||
}
|
||||
|
||||
namespace boost_no_rtti
|
||||
{
|
||||
|
||||
int check(const A& a)
|
||||
{
|
||||
return typeid(a) == typeid(B) ? 0 : 1;
|
||||
}
|
||||
|
||||
int test()
|
||||
{
|
||||
try{
|
||||
B b;
|
||||
return check(b);
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -987,6 +987,7 @@ void print_boost_macros()
|
||||
PRINT_MACRO(BOOST_NO_POINTER_TO_MEMBER_CONST);
|
||||
PRINT_MACRO(BOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS);
|
||||
PRINT_MACRO(BOOST_NO_PRIVATE_IN_AGGREGATE);
|
||||
PRINT_MACRO(BOOST_NO_RTTI);
|
||||
PRINT_MACRO(BOOST_NO_SFINAE);
|
||||
PRINT_MACRO(BOOST_NO_STDC_NAMESPACE);
|
||||
PRINT_MACRO(BOOST_NO_STD_ALLOCATOR);
|
||||
@@ -1033,6 +1034,7 @@ void print_boost_macros()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// END GENERATED BLOCK
|
||||
|
||||
+11
-1
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Sat Jul 12 12:39:34 2008
|
||||
// This file was automatically generated on Mon Aug 25 10:51:52 2008
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-4.
|
||||
// Use, modification and distribution are subject to the
|
||||
@@ -217,6 +217,11 @@ namespace boost_no_pointer_to_member_const = empty_boost;
|
||||
#else
|
||||
namespace boost_no_unreachable_return_detection = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_RTTI
|
||||
#include "boost_no_rtti.ipp"
|
||||
#else
|
||||
namespace boost_no_rtti = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_SFINAE
|
||||
#include "boost_no_sfinae.ipp"
|
||||
#else
|
||||
@@ -1051,6 +1056,11 @@ int main( int, char *[] )
|
||||
std::cerr << "Failed test for BOOST_NO_UNREACHABLE_RETURN_DETECTION at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_rtti::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_RTTI at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_sfinae::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_SFINAE at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
|
||||
+13
-12
@@ -72,40 +72,41 @@ autolink-lib link_test : ../link_test.cpp
|
||||
explicit link_test ;
|
||||
|
||||
run ../main.cpp link_test
|
||||
: : : <toolset>msvc-8.0:<build>no <link>static <runtime-link>static <threading>single debug : link_test_static_single_debug ;
|
||||
: : : <toolset>msvc-8.0:<build>no <link>static <runtime-link>static <threading>single debug : link_test_ssd ;
|
||||
|
||||
run ../main.cpp link_test
|
||||
: : : <toolset>msvc-8.0:<build>no <link>static <runtime-link>static <threading>single release : link_test_static_single_release ;
|
||||
: : : <toolset>msvc-8.0:<build>no <link>static <runtime-link>static <threading>single release : link_test_ssr ;
|
||||
|
||||
run ../main.cpp link_test
|
||||
: : : <link>static <runtime-link>static <threading>multi debug : link_test_static_multi_debug ;
|
||||
: : : <link>static <runtime-link>static <threading>multi debug : link_test_smd ;
|
||||
|
||||
run ../main.cpp link_test
|
||||
: : : <link>static <runtime-link>static <threading>multi release : link_test_static_multi_release ;
|
||||
: : : <link>static <runtime-link>static <threading>multi release : link_test_smr ;
|
||||
|
||||
run ../main.cpp link_test
|
||||
: : : <link>static <runtime-link>shared <threading>multi debug : link_test_dyn_multi_debug ;
|
||||
: : : <link>static <runtime-link>shared <threading>multi debug : link_test_dmd ;
|
||||
|
||||
run ../main.cpp link_test
|
||||
: : : <link>static <runtime-link>shared <threading>multi release : link_test_dyn_multi_release ;
|
||||
: : : <link>static <runtime-link>shared <threading>multi release : link_test_dmr ;
|
||||
|
||||
run ../main.cpp link_test
|
||||
: : : <link>static <runtime-link>shared <threading>single debug : link_test_dyn_single_debug ;
|
||||
: : : <link>static <runtime-link>shared <threading>single debug : link_test_dsd ;
|
||||
|
||||
run ../main.cpp link_test
|
||||
: : : <link>static <runtime-link>shared <threading>single release : link_test_dyn_single_release ;
|
||||
: : : <link>static <runtime-link>shared <threading>single release : link_test_dsr ;
|
||||
|
||||
run ../main.cpp link_test
|
||||
: : : <define>BOOST_DYN_LINK=1 <link>shared <runtime-link>shared <threading>multi debug : link_test_dll_dyn_multi_debug ;
|
||||
: : : <define>BOOST_DYN_LINK=1 <link>shared <runtime-link>shared <threading>multi debug : link_test_dll_dmd ;
|
||||
|
||||
run ../main.cpp link_test
|
||||
: : : <define>BOOST_DYN_LINK=1 <link>shared <runtime-link>shared <threading>multi release : link_test_dll_dyn_multi_release ;
|
||||
: : : <define>BOOST_DYN_LINK=1 <link>shared <runtime-link>shared <threading>multi release : link_test_dll_dmr ;
|
||||
|
||||
run ../main.cpp link_test
|
||||
: : : <define>BOOST_DYN_LINK=1 <link>shared <runtime-link>shared <threading>single debug : link_test_dll_dyn_single_debug ;
|
||||
: : : <define>BOOST_DYN_LINK=1 <link>shared <runtime-link>shared <threading>single debug : link_test_dll_dsd ;
|
||||
|
||||
run ../main.cpp link_test
|
||||
: : : <define>BOOST_DYN_LINK=1 <link>shared <runtime-link>shared <threading>single release : link_test_dll_dyn_single_release ;
|
||||
: : : <define>BOOST_DYN_LINK=1 <link>shared <runtime-link>shared <threading>single release : link_test_dll_dsr ;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
// This file was automatically generated on Mon Aug 25 10:51:51 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: generate.cpp 47351 2008-07-12 12:41:52Z johnmaddock $
|
||||
//
|
||||
|
||||
|
||||
// Test file for macro BOOST_NO_RTTI
|
||||
// This file should not compile, if it does then
|
||||
// BOOST_NO_RTTI should not be defined.
|
||||
// See file boost_no_rtti.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_RTTI
|
||||
#include "boost_no_rtti.ipp"
|
||||
#else
|
||||
#error "this file should not compile"
|
||||
#endif
|
||||
|
||||
int main( int, char *[] )
|
||||
{
|
||||
return boost_no_rtti::test();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
// This file was automatically generated on Mon Aug 25 10:51:51 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: generate.cpp 47351 2008-07-12 12:41:52Z johnmaddock $
|
||||
//
|
||||
|
||||
|
||||
// Test file for macro BOOST_NO_RTTI
|
||||
// This file should compile, if it does not then
|
||||
// BOOST_NO_RTTI should be defined.
|
||||
// See file boost_no_rtti.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_RTTI
|
||||
#include "boost_no_rtti.ipp"
|
||||
#else
|
||||
namespace boost_no_rtti = empty_boost;
|
||||
#endif
|
||||
|
||||
int main( int, char *[] )
|
||||
{
|
||||
return boost_no_rtti::test();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user