diff --git a/configure b/configure index 9c012332..89c9d49e 100644 --- a/configure +++ b/configure @@ -1957,8 +1957,6 @@ EOF cat_conts=`cat user.hpp` -fi - ac_config_commands="$ac_config_commands default" test "x$prefix" = xNONE && prefix=$ac_default_prefix @@ -2015,7 +2013,7 @@ rm -f confdef2opt.sed : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:2018: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:2016: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -2180,7 +2178,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:2183: error: ambiguous option: $1 + { { echo "$as_me:2181: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -2199,7 +2197,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:2202: error: unrecognized option: $1 + -*) { { echo "$as_me:2200: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -2244,7 +2242,7 @@ do case "$ac_config_target" in # Handling of arguments. "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - *) { { echo "$as_me:2247: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:2245: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -2336,3 +2334,5 @@ if test "$no_create" != yes; then $ac_cs_success || { (exit 1); exit 1; } fi +fi + diff --git a/test/boost_no_integral_int64_t.ipp b/test/boost_no_integral_int64_t.ipp new file mode 100644 index 00000000..716ecf6d --- /dev/null +++ b/test/boost_no_integral_int64_t.ipp @@ -0,0 +1,34 @@ +// (C) Copyright John Maddock 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// MACRO: BOOST_NO_INTEGRAL_INT64_T +// TITLE: long long and integral constant expressions +// DESCRIPTION: The platform supports long long in integral constant expressions. + +#include + + +namespace boost_no_integral_int64_t{ + +enum{ mask = 1uLL << 50 }; + +template +struct llt +{ + enum{ value = m }; +}; + +int test() +{ + llt m; + (void)m; + return 0; +} + +} + + + + diff --git a/test/config_test.cpp b/test/config_test.cpp index 0c306c97..a9ad8627 100644 --- a/test/config_test.cpp +++ b/test/config_test.cpp @@ -10,7 +10,7 @@ // Do not edit this file, it was generated automatically by // ../tools/generate from boost_*.cxx on -// Tue Oct 16 12:34:33 2001 +// Wed Oct 17 12:10:00 2001 #include #define BOOST_INCLUDE_MAIN @@ -77,6 +77,11 @@ namespace boost_no_function_template_ordering = empty_boost; #else namespace boost_no_inclass_member_initialization = empty_boost; #endif +#ifndef BOOST_NO_INTEGRAL_INT64_T +#include "boost_no_integral_int64_t.cxx" +#else +namespace boost_no_integral_int64_t = empty_boost; +#endif #ifndef BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS #include "boost_no_iter_construct.cxx" #else @@ -346,6 +351,7 @@ int test_main( int, char *[] ) BOOST_TEST(0 == boost_no_limits_compile_time_constants::test()); BOOST_TEST(0 == boost_no_limits::test()); BOOST_TEST(0 == boost_no_templated_iterator_constructors::test()); + BOOST_TEST(0 == boost_no_integral_int64_t::test()); BOOST_TEST(0 == boost_no_inclass_member_initialization::test()); BOOST_TEST(0 == boost_no_function_template_ordering::test()); BOOST_TEST(0 == boost_no_explicit_function_template_arguments::test()); diff --git a/test/has_long_long_fail.cpp b/test/has_long_long_fail.cpp new file mode 100644 index 00000000..713bd673 --- /dev/null +++ b/test/has_long_long_fail.cpp @@ -0,0 +1,36 @@ + +// (C) Copyright Boost.org 1999. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// Test file for macro BOOST_HAS_LONG_LONG +// This file should not compile, if it does then +// BOOST_HAS_LONG_LONG may be defined. +// see boost_has_long_long.cxx for more details + +// Do not edit this file, it was generated automatically by +// ../tools/generate from boost_has_long_long.cxx on +// Tue Oct 16 12:34:33 2001 + +// Must not have BOOST_ASSERT_CONFIG set; it defeats +// the objective of this file: +#ifdef BOOST_ASSERT_CONFIG +# undef BOOST_ASSERT_CONFIG +#endif + +#include +#include +#include "test.hpp" + +#ifndef BOOST_HAS_LONG_LONG +#include "boost_has_long_long.cxx" +#else +#error "this file should not compile" +#endif + +int cpp_main( int, char *[] ) +{ + return boost_has_long_long::test(); +} + diff --git a/test/has_long_long_pass.cpp b/test/has_long_long_pass.cpp new file mode 100644 index 00000000..d9b837fe --- /dev/null +++ b/test/has_long_long_pass.cpp @@ -0,0 +1,36 @@ + +// (C) Copyright Boost.org 1999. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// Test file for macro BOOST_HAS_LONG_LONG +// This file should compile, if it does not then +// BOOST_HAS_LONG_LONG should not be defined. +// see boost_has_long_long.cxx for more details + +// Do not edit this file, it was generated automatically by +// ../tools/generate from boost_has_long_long.cxx on +// Tue Oct 16 12:34:33 2001 + +// Must not have BOOST_ASSERT_CONFIG set; it defeats +// the objective of this file: +#ifdef BOOST_ASSERT_CONFIG +# undef BOOST_ASSERT_CONFIG +#endif + +#include +#include +#include "test.hpp" + +#ifdef BOOST_HAS_LONG_LONG +#include "boost_has_long_long.cxx" +#else +namespace boost_has_long_long = empty_boost; +#endif + +int cpp_main( int, char *[] ) +{ + return boost_has_long_long::test(); +} + diff --git a/test/no_integral_int64_t_fail.cpp b/test/no_integral_int64_t_fail.cpp new file mode 100644 index 00000000..499d7273 --- /dev/null +++ b/test/no_integral_int64_t_fail.cpp @@ -0,0 +1,36 @@ + +// (C) Copyright Boost.org 1999. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// Test file for macro BOOST_NO_INTEGRAL_INT64_T +// This file should not compile, if it does then +// BOOST_NO_INTEGRAL_INT64_T need not be defined. +// see boost_no_integral_int64_t.cxx for more details + +// Do not edit this file, it was generated automatically by +// ../tools/generate from boost_no_integral_int64_t.cxx on +// Wed Oct 17 12:10:00 2001 + +// Must not have BOOST_ASSERT_CONFIG set; it defeats +// the objective of this file: +#ifdef BOOST_ASSERT_CONFIG +# undef BOOST_ASSERT_CONFIG +#endif + +#include +#include +#include "test.hpp" + +#ifdef BOOST_NO_INTEGRAL_INT64_T +#include "boost_no_integral_int64_t.cxx" +#else +#error "this file should not compile" +#endif + +int cpp_main( int, char *[] ) +{ + return boost_no_integral_int64_t::test(); +} + diff --git a/test/no_integral_int64_t_pass.cpp b/test/no_integral_int64_t_pass.cpp new file mode 100644 index 00000000..06f121ed --- /dev/null +++ b/test/no_integral_int64_t_pass.cpp @@ -0,0 +1,36 @@ + +// (C) Copyright Boost.org 1999. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// Test file for macro BOOST_NO_INTEGRAL_INT64_T +// This file should compile, if it does not then +// BOOST_NO_INTEGRAL_INT64_T needs to be defined. +// see boost_no_integral_int64_t.cxx for more details + +// Do not edit this file, it was generated automatically by +// ../tools/generate from boost_no_integral_int64_t.cxx on +// Wed Oct 17 12:10:00 2001 + +// Must not have BOOST_ASSERT_CONFIG set; it defeats +// the objective of this file: +#ifdef BOOST_ASSERT_CONFIG +# undef BOOST_ASSERT_CONFIG +#endif + +#include +#include +#include "test.hpp" + +#ifndef BOOST_NO_INTEGRAL_INT64_T +#include "boost_no_integral_int64_t.cxx" +#else +namespace boost_no_integral_int64_t = empty_boost; +#endif + +int cpp_main( int, char *[] ) +{ + return boost_no_integral_int64_t::test(); +} + diff --git a/test/regression.cfg b/test/regression.cfg index 55be7aaf..849289a6 100644 --- a/test/regression.cfg +++ b/test/regression.cfg @@ -29,6 +29,8 @@ run libs/config/test/no_func_tmp_order_pass.cpp link-fail libs/config/test/no_func_tmp_order_fail.cpp run libs/config/test/no_inline_memb_init_pass.cpp link-fail libs/config/test/no_inline_memb_init_fail.cpp +run libs/config/test/no_integral_int64_t_pass.cpp +link-fail libs/config/test/no_integral_int64_t_fail.cpp run libs/config/test/no_iter_construct_pass.cpp link-fail libs/config/test/no_iter_construct_fail.cpp run libs/config/test/no_limits_pass.cpp diff --git a/tools/configure.in b/tools/configure.in index daad9f58..44a2699b 100644 --- a/tools/configure.in +++ b/tools/configure.in @@ -364,9 +364,6 @@ EOF cat_conts=`cat user.hpp` -fi - - AC_OUTPUT( [], [ @@ -389,6 +386,8 @@ cat_conts="$cat_conts" ] ) +fi +