diff --git a/configure b/configure
index ad2a4eff..16593837 100644
--- a/configure
+++ b/configure
@@ -2169,9 +2169,9 @@ fi
 #
 # enumerate test files and test each one:
 #
-for file in $boost_base/libs/config/test/boost_no*.cxx; do
+for file in $boost_base/libs/config/test/boost_no*.ipp; do
 
-   basename=`echo $file | sed 's/.*boost_\(.*\)\.cxx/\1/'`
+   basename=`echo $file | sed 's/.*boost_\(.*\)\.ipp/\1/'`
    macroname=`cat $file | grep '^//[]    []*MACRO:' | sed 's/.*MACRO:[]    []*\([]_A-Z0-9[]*\).*/\1/'`
    title=`cat $file | grep '^//[]  []*TITLE:' | sed 's/.*TITLE:[]    []*\([]^  [].*\)/\1/'`
    namespace=`echo $macroname | tr [:upper:] [:lower:]`
@@ -2208,7 +2208,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include "test.hpp"
 
 #ifndef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 namespace ${namespace} = empty_boost;
 #endif
@@ -2267,7 +2267,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include "test.hpp"
 
 #ifdef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 #error "this file should not compile"
 #endif
@@ -2310,9 +2310,9 @@ done
 #
 # enumerate optional test files and test each one:
 #
-for file in $boost_base/libs/config/test/boost_has*.cxx; do
+for file in $boost_base/libs/config/test/boost_has*.ipp; do
 
-   basename=`echo $file | sed 's/.*boost_\(.*\)\.cxx/\1/'`
+   basename=`echo $file | sed 's/.*boost_\(.*\)\.ipp/\1/'`
    macroname=`cat $file | grep '^//[]    []*MACRO:' | sed 's/.*MACRO:[]    []*\([]_A-Z0-9[]*\).*/\1/'`
    title=`cat $file | grep '^//[]  []*TITLE:' | sed 's/.*TITLE:[]    []*\([]^  [].*\)/\1/'`
    namespace=`echo $macroname | tr [:upper:] [:lower:]`
@@ -2344,7 +2344,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include "test.hpp"
 
 #ifdef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 namespace ${namespace} = empty_boost;
 #endif
@@ -2400,7 +2400,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include "test.hpp"
 
 #ifndef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 #error "this file should not compile"
 #endif
@@ -2462,7 +2462,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <boost/config.hpp>
 #include "test.hpp"
 
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 
 int main(){ return ${namespace}::test(); }
 
@@ -3336,5 +3336,6 @@ fi
 
 
 
+
 
 
diff --git a/test/Jamfile b/test/Jamfile
index 24400273..c09533bb 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -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 Dec 13 12:29:38 GMTST 2003,
+# This file was automatically generated on Tue Jun 15 11:50:28 GMTST 2004,
 # by libs/config/tools/generate
 #
 # If you need to alter build preferences then set them in
@@ -12,11 +12,9 @@ subproject libs/config/test ;
 import testing ./options ;
 
 run config_info.cpp <template>config_options ;
-run config_test.cpp <lib>../../test/build/boost_test_exec_monitor <template>config_options ;
+run config_test.cpp <template>config_options ;
 run limits_test.cpp <template>config_test_options ;
 run abi/abi_test.cpp abi/main.cpp <template>config_options ;
-compile-fail threads/test_thread_fail1.cpp ;
-compile-fail threads/test_thread_fail2.cpp ;
 
 test-suite "BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP" : 
 [ run no_arg_dep_lookup_pass.cpp <template>config_test_options ]
diff --git a/test/config_test.cpp b/test/config_test.cpp
index bdeb861a..f4b9f5c0 100644
--- a/test/config_test.cpp
+++ b/test/config_test.cpp
@@ -7,505 +7,830 @@
 // Test file for config setup
 // This file should compile, if it does not then
 // one or more macros need to be defined.
-// see boost_*.cxx for more details
+// see boost_*.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_*.cxx on
-// Sat Dec 13 12:29:38 GMTST 2003
+// ../tools/generate from boost_*.ipp on
+// Tue Jun 15 11:50:28 GMTST 2004
 
 #include <boost/config.hpp>
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#include <iostream>
 #include "test.hpp"
 
+int error_count = 0;
+
 #ifndef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-#include "boost_no_arg_dep_lookup.cxx"
+#include "boost_no_arg_dep_lookup.ipp"
 #else
 namespace boost_no_argument_dependent_lookup = empty_boost;
 #endif
 #ifndef BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS
-#include "boost_no_array_type_spec.cxx"
+#include "boost_no_array_type_spec.ipp"
 #else
 namespace boost_no_array_type_specializations = empty_boost;
 #endif
 #ifndef BOOST_NO_AUTO_PTR
-#include "boost_no_auto_ptr.cxx"
+#include "boost_no_auto_ptr.ipp"
 #else
 namespace boost_no_auto_ptr = empty_boost;
 #endif
 #ifndef BOOST_BCB_PARTIAL_SPECIALIZATION_BUG
-#include "boost_no_bcb_partial_spec.cxx"
+#include "boost_no_bcb_partial_spec.ipp"
 #else
 namespace boost_bcb_partial_specialization_bug = empty_boost;
 #endif
 #ifndef BOOST_NO_CTYPE_FUNCTIONS
-#include "boost_no_ctype_functions.cxx"
+#include "boost_no_ctype_functions.ipp"
 #else
 namespace boost_no_ctype_functions = empty_boost;
 #endif
 #ifndef BOOST_NO_CV_SPECIALIZATIONS
-#include "boost_no_cv_spec.cxx"
+#include "boost_no_cv_spec.ipp"
 #else
 namespace boost_no_cv_specializations = empty_boost;
 #endif
 #ifndef BOOST_NO_CV_VOID_SPECIALIZATIONS
-#include "boost_no_cv_void_spec.cxx"
+#include "boost_no_cv_void_spec.ipp"
 #else
 namespace boost_no_cv_void_specializations = empty_boost;
 #endif
 #ifndef BOOST_NO_CWCHAR
-#include "boost_no_cwchar.cxx"
+#include "boost_no_cwchar.ipp"
 #else
 namespace boost_no_cwchar = empty_boost;
 #endif
 #ifndef BOOST_NO_CWCTYPE
-#include "boost_no_cwctype.cxx"
+#include "boost_no_cwctype.ipp"
 #else
 namespace boost_no_cwctype = empty_boost;
 #endif
 #ifndef BOOST_DEDUCED_TYPENAME
-#include "boost_no_ded_typename.cxx"
+#include "boost_no_ded_typename.ipp"
 #else
 namespace boost_deduced_typename = empty_boost;
 #endif
 #ifndef BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
-#include "boost_no_dep_nested_class.cxx"
+#include "boost_no_dep_nested_class.ipp"
 #else
 namespace boost_no_dependent_nested_derivations = empty_boost;
 #endif
 #ifndef BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
-#include "boost_no_dep_val_param.cxx"
+#include "boost_no_dep_val_param.ipp"
 #else
 namespace boost_no_dependent_types_in_template_value_parameters = empty_boost;
 #endif
 #ifndef BOOST_NO_EXCEPTION_STD_NAMESPACE
-#include "boost_no_excep_std.cxx"
+#include "boost_no_excep_std.ipp"
 #else
 namespace boost_no_exception_std_namespace = empty_boost;
 #endif
 #ifndef BOOST_NO_EXCEPTIONS
-#include "boost_no_exceptions.cxx"
+#include "boost_no_exceptions.ipp"
 #else
 namespace boost_no_exceptions = empty_boost;
 #endif
 #ifndef BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
-#include "boost_no_exp_func_tem_arg.cxx"
+#include "boost_no_exp_func_tem_arg.ipp"
 #else
 namespace boost_no_explicit_function_template_arguments = empty_boost;
 #endif
 #ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-#include "boost_no_func_tmp_order.cxx"
+#include "boost_no_func_tmp_order.ipp"
 #else
 namespace boost_no_function_template_ordering = empty_boost;
 #endif
 #ifndef BOOST_NO_MS_INT64_NUMERIC_LIMITS
-#include "boost_no_i64_limits.cxx"
+#include "boost_no_i64_limits.ipp"
 #else
 namespace boost_no_ms_int64_numeric_limits = empty_boost;
 #endif
 #ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-#include "boost_no_inline_memb_init.cxx"
+#include "boost_no_inline_memb_init.ipp"
 #else
 namespace boost_no_inclass_member_initialization = empty_boost;
 #endif
 #ifndef BOOST_NO_INTEGRAL_INT64_T
-#include "boost_no_integral_int64_t.cxx"
+#include "boost_no_integral_int64_t.ipp"
 #else
 namespace boost_no_integral_int64_t = empty_boost;
 #endif
 #ifndef BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS
-#include "boost_no_iter_construct.cxx"
+#include "boost_no_iter_construct.ipp"
 #else
 namespace boost_no_templated_iterator_constructors = empty_boost;
 #endif
 #ifndef BOOST_NO_LIMITS
-#include "boost_no_limits.cxx"
+#include "boost_no_limits.ipp"
 #else
 namespace boost_no_limits = empty_boost;
 #endif
 #ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
-#include "boost_no_limits_const_exp.cxx"
+#include "boost_no_limits_const_exp.ipp"
 #else
 namespace boost_no_limits_compile_time_constants = empty_boost;
 #endif
 #ifndef BOOST_NO_LONG_LONG_NUMERIC_LIMITS
-#include "boost_no_ll_limits.cxx"
+#include "boost_no_ll_limits.ipp"
 #else
 namespace boost_no_long_long_numeric_limits = empty_boost;
 #endif
 #ifndef BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
-#include "boost_no_mem_func_spec.cxx"
+#include "boost_no_mem_func_spec.ipp"
 #else
 namespace boost_no_member_function_specializations = empty_boost;
 #endif
 #ifndef BOOST_NO_MEMBER_TEMPLATE_KEYWORD
-#include "boost_no_mem_tem_keyword.cxx"
+#include "boost_no_mem_tem_keyword.ipp"
 #else
 namespace boost_no_member_template_keyword = empty_boost;
 #endif
 #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-#include "boost_no_mem_templ_frnds.cxx"
+#include "boost_no_mem_templ_frnds.ipp"
 #else
 namespace boost_no_member_template_friends = empty_boost;
 #endif
 #ifndef BOOST_NO_MEMBER_TEMPLATES
-#include "boost_no_mem_templates.cxx"
+#include "boost_no_mem_templates.ipp"
 #else
 namespace boost_no_member_templates = empty_boost;
 #endif
 #ifndef BOOST_NO_OPERATORS_IN_NAMESPACE
-#include "boost_no_ops_in_namespace.cxx"
+#include "boost_no_ops_in_namespace.ipp"
 #else
 namespace boost_no_operators_in_namespace = empty_boost;
 #endif
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#include "boost_no_partial_spec.cxx"
+#include "boost_no_partial_spec.ipp"
 #else
 namespace boost_no_template_partial_specialization = empty_boost;
 #endif
 #ifndef BOOST_NO_PRIVATE_IN_AGGREGATE
-#include "boost_no_priv_aggregate.cxx"
+#include "boost_no_priv_aggregate.ipp"
 #else
 namespace boost_no_private_in_aggregate = empty_boost;
 #endif
 #ifndef BOOST_NO_POINTER_TO_MEMBER_CONST
-#include "boost_no_ptr_mem_const.cxx"
+#include "boost_no_ptr_mem_const.ipp"
 #else
 namespace boost_no_pointer_to_member_const = empty_boost;
 #endif
 #ifndef BOOST_NO_UNREACHABLE_RETURN_DETECTION
-#include "boost_no_ret_det.cxx"
+#include "boost_no_ret_det.ipp"
 #else
 namespace boost_no_unreachable_return_detection = empty_boost;
 #endif
 #ifndef BOOST_NO_SFINAE
-#include "boost_no_sfinae.cxx"
+#include "boost_no_sfinae.ipp"
 #else
 namespace boost_no_sfinae = empty_boost;
 #endif
 #ifndef BOOST_NO_STRINGSTREAM
-#include "boost_no_sstream.cxx"
+#include "boost_no_sstream.ipp"
 #else
 namespace boost_no_stringstream = empty_boost;
 #endif
 #ifndef BOOST_NO_STD_ALLOCATOR
-#include "boost_no_std_allocator.cxx"
+#include "boost_no_std_allocator.ipp"
 #else
 namespace boost_no_std_allocator = empty_boost;
 #endif
 #ifndef BOOST_NO_STD_DISTANCE
-#include "boost_no_std_distance.cxx"
+#include "boost_no_std_distance.ipp"
 #else
 namespace boost_no_std_distance = empty_boost;
 #endif
 #ifndef BOOST_NO_STD_ITERATOR_TRAITS
-#include "boost_no_std_iter_traits.cxx"
+#include "boost_no_std_iter_traits.ipp"
 #else
 namespace boost_no_std_iterator_traits = empty_boost;
 #endif
 #ifndef BOOST_NO_STD_ITERATOR
-#include "boost_no_std_iterator.cxx"
+#include "boost_no_std_iterator.ipp"
 #else
 namespace boost_no_std_iterator = empty_boost;
 #endif
 #ifndef BOOST_NO_STD_LOCALE
-#include "boost_no_std_locale.cxx"
+#include "boost_no_std_locale.ipp"
 #else
 namespace boost_no_std_locale = empty_boost;
 #endif
 #ifndef BOOST_NO_STD_MESSAGES
-#include "boost_no_std_messages.cxx"
+#include "boost_no_std_messages.ipp"
 #else
 namespace boost_no_std_messages = empty_boost;
 #endif
 #ifndef BOOST_NO_STD_MIN_MAX
-#include "boost_no_std_min_max.cxx"
+#include "boost_no_std_min_max.ipp"
 #else
 namespace boost_no_std_min_max = empty_boost;
 #endif
 #ifndef BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN
-#include "boost_no_std_oi_assign.cxx"
+#include "boost_no_std_oi_assign.ipp"
 #else
 namespace boost_no_std_output_iterator_assign = empty_boost;
 #endif
 #ifndef BOOST_NO_STD_USE_FACET
-#include "boost_no_std_use_facet.cxx"
+#include "boost_no_std_use_facet.ipp"
 #else
 namespace boost_no_std_use_facet = empty_boost;
 #endif
 #ifndef BOOST_NO_STD_WSTREAMBUF
-#include "boost_no_std_wstreambuf.cxx"
+#include "boost_no_std_wstreambuf.ipp"
 #else
 namespace boost_no_std_wstreambuf = empty_boost;
 #endif
 #ifndef BOOST_NO_STD_WSTRING
-#include "boost_no_std_wstring.cxx"
+#include "boost_no_std_wstring.ipp"
 #else
 namespace boost_no_std_wstring = empty_boost;
 #endif
 #ifndef BOOST_NO_STDC_NAMESPACE
-#include "boost_no_stdc_namespace.cxx"
+#include "boost_no_stdc_namespace.ipp"
 #else
 namespace boost_no_stdc_namespace = empty_boost;
 #endif
 #ifndef BOOST_NO_SWPRINTF
-#include "boost_no_swprintf.cxx"
+#include "boost_no_swprintf.ipp"
 #else
 namespace boost_no_swprintf = empty_boost;
 #endif
 #ifndef BOOST_NO_TEMPLATE_TEMPLATES
-#include "boost_no_template_template.cxx"
+#include "boost_no_template_template.ipp"
 #else
 namespace boost_no_template_templates = empty_boost;
 #endif
 #ifndef BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
-#include "boost_no_using_breaks_adl.cxx"
+#include "boost_no_using_breaks_adl.ipp"
 #else
 namespace boost_function_scope_using_declaration_breaks_adl = empty_boost;
 #endif
 #ifndef BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
-#include "boost_no_using_decl_overld.cxx"
+#include "boost_no_using_decl_overld.ipp"
 #else
 namespace boost_no_using_declaration_overloads_from_typename_base = empty_boost;
 #endif
 #ifndef BOOST_NO_USING_TEMPLATE
-#include "boost_no_using_template.cxx"
+#include "boost_no_using_template.ipp"
 #else
 namespace boost_no_using_template = empty_boost;
 #endif
 #ifndef BOOST_NO_VOID_RETURNS
-#include "boost_no_void_returns.cxx"
+#include "boost_no_void_returns.ipp"
 #else
 namespace boost_no_void_returns = empty_boost;
 #endif
 #ifndef BOOST_NO_INTRINSIC_WCHAR_T
-#include "boost_no_wchar_t.cxx"
+#include "boost_no_wchar_t.ipp"
 #else
 namespace boost_no_intrinsic_wchar_t = empty_boost;
 #endif
 #ifdef BOOST_HAS_TWO_ARG_USE_FACET
-#include "boost_has_2arg_use_facet.cxx"
+#include "boost_has_2arg_use_facet.ipp"
 #else
 namespace boost_has_two_arg_use_facet = empty_boost;
 #endif
 #ifdef BOOST_HAS_BETHREADS
-#include "boost_has_bethreads.cxx"
+#include "boost_has_bethreads.ipp"
 #else
 namespace boost_has_bethreads = empty_boost;
 #endif
 #ifdef BOOST_HAS_CLOCK_GETTIME
-#include "boost_has_clock_gettime.cxx"
+#include "boost_has_clock_gettime.ipp"
 #else
 namespace boost_has_clock_gettime = empty_boost;
 #endif
 #ifdef BOOST_HAS_DIRENT_H
-#include "boost_has_dirent_h.cxx"
+#include "boost_has_dirent_h.ipp"
 #else
 namespace boost_has_dirent_h = empty_boost;
 #endif
 #ifdef BOOST_HAS_FTIME
-#include "boost_has_ftime.cxx"
+#include "boost_has_ftime.ipp"
 #else
 namespace boost_has_ftime = empty_boost;
 #endif
 #ifdef BOOST_HAS_GETTIMEOFDAY
-#include "boost_has_gettimeofday.cxx"
+#include "boost_has_gettimeofday.ipp"
 #else
 namespace boost_has_gettimeofday = empty_boost;
 #endif
 #ifdef BOOST_HAS_HASH
-#include "boost_has_hash.cxx"
+#include "boost_has_hash.ipp"
 #else
 namespace boost_has_hash = empty_boost;
 #endif
 #ifdef BOOST_HAS_LONG_LONG
-#include "boost_has_long_long.cxx"
+#include "boost_has_long_long.ipp"
 #else
 namespace boost_has_long_long = empty_boost;
 #endif
 #ifdef BOOST_HAS_MACRO_USE_FACET
-#include "boost_has_macro_use_facet.cxx"
+#include "boost_has_macro_use_facet.ipp"
 #else
 namespace boost_has_macro_use_facet = empty_boost;
 #endif
 #ifdef BOOST_HAS_MS_INT64
-#include "boost_has_ms_int64.cxx"
+#include "boost_has_ms_int64.ipp"
 #else
 namespace boost_has_ms_int64 = empty_boost;
 #endif
 #ifdef BOOST_HAS_NANOSLEEP
-#include "boost_has_nanosleep.cxx"
+#include "boost_has_nanosleep.ipp"
 #else
 namespace boost_has_nanosleep = empty_boost;
 #endif
 #ifdef BOOST_HAS_NL_TYPES_H
-#include "boost_has_nl_types_h.cxx"
+#include "boost_has_nl_types_h.ipp"
 #else
 namespace boost_has_nl_types_h = empty_boost;
 #endif
 #ifdef BOOST_HAS_NRVO
-#include "boost_has_nrvo.cxx"
+#include "boost_has_nrvo.ipp"
 #else
 namespace boost_has_nrvo = empty_boost;
 #endif
 #ifdef BOOST_HAS_PARTIAL_STD_ALLOCATOR
-#include "boost_has_part_alloc.cxx"
+#include "boost_has_part_alloc.ipp"
 #else
 namespace boost_has_partial_std_allocator = empty_boost;
 #endif
 #ifdef BOOST_HAS_PTHREAD_DELAY_NP
-#include "boost_has_pthread_delay_np.cxx"
+#include "boost_has_pthread_delay_np.ipp"
 #else
 namespace boost_has_pthread_delay_np = empty_boost;
 #endif
 #ifdef BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
-#include "boost_has_pthread_ma_st.cxx"
+#include "boost_has_pthread_ma_st.ipp"
 #else
 namespace boost_has_pthread_mutexattr_settype = empty_boost;
 #endif
 #ifdef BOOST_HAS_PTHREAD_YIELD
-#include "boost_has_pthread_yield.cxx"
+#include "boost_has_pthread_yield.ipp"
 #else
 namespace boost_has_pthread_yield = empty_boost;
 #endif
 #ifdef BOOST_HAS_PTHREADS
-#include "boost_has_pthreads.cxx"
+#include "boost_has_pthreads.ipp"
 #else
 namespace boost_has_pthreads = empty_boost;
 #endif
 #ifdef BOOST_HAS_SCHED_YIELD
-#include "boost_has_sched_yield.cxx"
+#include "boost_has_sched_yield.ipp"
 #else
 namespace boost_has_sched_yield = empty_boost;
 #endif
 #ifdef BOOST_HAS_SGI_TYPE_TRAITS
-#include "boost_has_sgi_type_traits.cxx"
+#include "boost_has_sgi_type_traits.ipp"
 #else
 namespace boost_has_sgi_type_traits = empty_boost;
 #endif
 #ifdef BOOST_HAS_SIGACTION
-#include "boost_has_sigaction.cxx"
+#include "boost_has_sigaction.ipp"
 #else
 namespace boost_has_sigaction = empty_boost;
 #endif
 #ifdef BOOST_HAS_SLIST
-#include "boost_has_slist.cxx"
+#include "boost_has_slist.ipp"
 #else
 namespace boost_has_slist = empty_boost;
 #endif
 #ifdef BOOST_HAS_STDINT_H
-#include "boost_has_stdint_h.cxx"
+#include "boost_has_stdint_h.ipp"
 #else
 namespace boost_has_stdint_h = empty_boost;
 #endif
 #ifdef BOOST_HAS_STLP_USE_FACET
-#include "boost_has_stlp_use_facet.cxx"
+#include "boost_has_stlp_use_facet.ipp"
 #else
 namespace boost_has_stlp_use_facet = empty_boost;
 #endif
 #ifdef BOOST_HAS_UNISTD_H
-#include "boost_has_unistd_h.cxx"
+#include "boost_has_unistd_h.ipp"
 #else
 namespace boost_has_unistd_h = empty_boost;
 #endif
 #ifdef BOOST_MSVC6_MEMBER_TEMPLATES
-#include "boost_has_vc6_mem_templ.cxx"
+#include "boost_has_vc6_mem_templ.ipp"
 #else
 namespace boost_msvc6_member_templates = empty_boost;
 #endif
 #ifdef BOOST_MSVC_STD_ITERATOR
-#include "boost_has_vc_iterator.cxx"
+#include "boost_has_vc_iterator.ipp"
 #else
 namespace boost_msvc_std_iterator = empty_boost;
 #endif
 #ifdef BOOST_HAS_WINTHREADS
-#include "boost_has_winthreads.cxx"
+#include "boost_has_winthreads.ipp"
 #else
 namespace boost_has_winthreads = empty_boost;
 #endif
 
-int test_main( int, char *[] )
+int main( int, char *[] )
 {
-   BOOST_TEST(0 == boost_no_intrinsic_wchar_t::test());
-   BOOST_TEST(0 == boost_no_void_returns::test());
-   BOOST_TEST(0 == boost_no_using_template::test());
-   BOOST_TEST(0 == boost_no_using_declaration_overloads_from_typename_base::test());
-   BOOST_TEST(0 == boost_function_scope_using_declaration_breaks_adl::test());
-   BOOST_TEST(0 == boost_no_template_templates::test());
-   BOOST_TEST(0 == boost_no_swprintf::test());
-   BOOST_TEST(0 == boost_no_stdc_namespace::test());
-   BOOST_TEST(0 == boost_no_std_wstring::test());
-   BOOST_TEST(0 == boost_no_std_wstreambuf::test());
-   BOOST_TEST(0 == boost_no_std_use_facet::test());
-   BOOST_TEST(0 == boost_no_std_output_iterator_assign::test());
-   BOOST_TEST(0 == boost_no_std_min_max::test());
-   BOOST_TEST(0 == boost_no_std_messages::test());
-   BOOST_TEST(0 == boost_no_std_locale::test());
-   BOOST_TEST(0 == boost_no_std_iterator::test());
-   BOOST_TEST(0 == boost_no_std_iterator_traits::test());
-   BOOST_TEST(0 == boost_no_std_distance::test());
-   BOOST_TEST(0 == boost_no_std_allocator::test());
-   BOOST_TEST(0 == boost_no_stringstream::test());
-   BOOST_TEST(0 == boost_no_sfinae::test());
-   BOOST_TEST(0 == boost_no_unreachable_return_detection::test());
-   BOOST_TEST(0 == boost_no_pointer_to_member_const::test());
-   BOOST_TEST(0 == boost_no_private_in_aggregate::test());
-   BOOST_TEST(0 == boost_no_template_partial_specialization::test());
-   BOOST_TEST(0 == boost_no_operators_in_namespace::test());
-   BOOST_TEST(0 == boost_no_member_templates::test());
-   BOOST_TEST(0 == boost_no_member_template_friends::test());
-   BOOST_TEST(0 == boost_no_member_template_keyword::test());
-   BOOST_TEST(0 == boost_no_member_function_specializations::test());
-   BOOST_TEST(0 == boost_no_long_long_numeric_limits::test());
-   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_ms_int64_numeric_limits::test());
-   BOOST_TEST(0 == boost_no_function_template_ordering::test());
-   BOOST_TEST(0 == boost_no_explicit_function_template_arguments::test());
-   BOOST_TEST(0 == boost_no_exceptions::test());
-   BOOST_TEST(0 == boost_no_exception_std_namespace::test());
-   BOOST_TEST(0 == boost_no_dependent_types_in_template_value_parameters::test());
-   BOOST_TEST(0 == boost_no_dependent_nested_derivations::test());
-   BOOST_TEST(0 == boost_deduced_typename::test());
-   BOOST_TEST(0 == boost_no_cwctype::test());
-   BOOST_TEST(0 == boost_no_cwchar::test());
-   BOOST_TEST(0 == boost_no_cv_void_specializations::test());
-   BOOST_TEST(0 == boost_no_cv_specializations::test());
-   BOOST_TEST(0 == boost_no_ctype_functions::test());
-   BOOST_TEST(0 == boost_bcb_partial_specialization_bug::test());
-   BOOST_TEST(0 == boost_no_auto_ptr::test());
-   BOOST_TEST(0 == boost_no_array_type_specializations::test());
-   BOOST_TEST(0 == boost_no_argument_dependent_lookup::test());
-   BOOST_TEST(0 == boost_has_winthreads::test());
-   BOOST_TEST(0 == boost_msvc_std_iterator::test());
-   BOOST_TEST(0 == boost_msvc6_member_templates::test());
-   BOOST_TEST(0 == boost_has_unistd_h::test());
-   BOOST_TEST(0 == boost_has_stlp_use_facet::test());
-   BOOST_TEST(0 == boost_has_stdint_h::test());
-   BOOST_TEST(0 == boost_has_slist::test());
-   BOOST_TEST(0 == boost_has_sigaction::test());
-   BOOST_TEST(0 == boost_has_sgi_type_traits::test());
-   BOOST_TEST(0 == boost_has_sched_yield::test());
-   BOOST_TEST(0 == boost_has_pthreads::test());
-   BOOST_TEST(0 == boost_has_pthread_yield::test());
-   BOOST_TEST(0 == boost_has_pthread_mutexattr_settype::test());
-   BOOST_TEST(0 == boost_has_pthread_delay_np::test());
-   BOOST_TEST(0 == boost_has_partial_std_allocator::test());
-   BOOST_TEST(0 == boost_has_nrvo::test());
-   BOOST_TEST(0 == boost_has_nl_types_h::test());
-   BOOST_TEST(0 == boost_has_nanosleep::test());
-   BOOST_TEST(0 == boost_has_ms_int64::test());
-   BOOST_TEST(0 == boost_has_macro_use_facet::test());
-   BOOST_TEST(0 == boost_has_long_long::test());
-   BOOST_TEST(0 == boost_has_hash::test());
-   BOOST_TEST(0 == boost_has_gettimeofday::test());
-   BOOST_TEST(0 == boost_has_ftime::test());
-   BOOST_TEST(0 == boost_has_dirent_h::test());
-   BOOST_TEST(0 == boost_has_clock_gettime::test());
-   BOOST_TEST(0 == boost_has_bethreads::test());
-   BOOST_TEST(0 == boost_has_two_arg_use_facet::test());
-   return 0;
+   if(0 != boost_no_intrinsic_wchar_t::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_void_returns::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_using_template::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_using_declaration_overloads_from_typename_base::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_function_scope_using_declaration_breaks_adl::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_template_templates::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_swprintf::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_stdc_namespace::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_std_wstring::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_std_wstreambuf::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_std_use_facet::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_std_output_iterator_assign::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_std_min_max::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_std_messages::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_std_locale::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_std_iterator::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_std_iterator_traits::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_std_distance::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_std_allocator::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_stringstream::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_sfinae::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_unreachable_return_detection::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_pointer_to_member_const::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_private_in_aggregate::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_template_partial_specialization::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_operators_in_namespace::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_member_templates::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_member_template_friends::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_member_template_keyword::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_member_function_specializations::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_long_long_numeric_limits::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_limits_compile_time_constants::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_limits::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_templated_iterator_constructors::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_integral_int64_t::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_inclass_member_initialization::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_ms_int64_numeric_limits::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_function_template_ordering::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_explicit_function_template_arguments::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_exceptions::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_exception_std_namespace::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_dependent_types_in_template_value_parameters::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_dependent_nested_derivations::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_deduced_typename::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_cwctype::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_cwchar::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_cv_void_specializations::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_cv_specializations::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_ctype_functions::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_bcb_partial_specialization_bug::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_auto_ptr::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_array_type_specializations::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_argument_dependent_lookup::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_winthreads::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_msvc_std_iterator::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_msvc6_member_templates::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_unistd_h::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_stlp_use_facet::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_stdint_h::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_slist::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_sigaction::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_sgi_type_traits::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_sched_yield::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_pthreads::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_pthread_yield::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_pthread_mutexattr_settype::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_pthread_delay_np::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_partial_std_allocator::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_nrvo::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_nl_types_h::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_nanosleep::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_ms_int64::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_macro_use_facet::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_long_long::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_hash::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_gettimeofday::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_ftime::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_dirent_h::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_clock_gettime::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_bethreads::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_has_two_arg_use_facet::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_WINTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   return error_count;
 }
diff --git a/test/has_2arg_use_facet_fail.cpp b/test/has_2arg_use_facet_fail.cpp
index 87553978..d46a6de1 100644
--- a/test/has_2arg_use_facet_fail.cpp
+++ b/test/has_2arg_use_facet_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_TWO_ARG_USE_FACET
 // This file should not compile, if it does then
 // BOOST_HAS_TWO_ARG_USE_FACET may be defined.
-// see boost_has_2arg_use_facet.cxx for more details
+// see boost_has_2arg_use_facet.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_2arg_use_facet.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_2arg_use_facet.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_TWO_ARG_USE_FACET
-#include "boost_has_2arg_use_facet.cxx"
+#include "boost_has_2arg_use_facet.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_two_arg_use_facet::test();
 }  
diff --git a/test/has_2arg_use_facet_pass.cpp b/test/has_2arg_use_facet_pass.cpp
index 18206fa7..6ca42d83 100644
--- a/test/has_2arg_use_facet_pass.cpp
+++ b/test/has_2arg_use_facet_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_TWO_ARG_USE_FACET
 // This file should compile, if it does not then
 // BOOST_HAS_TWO_ARG_USE_FACET should not be defined.
-// see boost_has_2arg_use_facet.cxx for more details
+// see boost_has_2arg_use_facet.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_2arg_use_facet.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_2arg_use_facet.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_TWO_ARG_USE_FACET
-#include "boost_has_2arg_use_facet.cxx"
+#include "boost_has_2arg_use_facet.ipp"
 #else
 namespace boost_has_two_arg_use_facet = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_two_arg_use_facet::test();
 }  
diff --git a/test/has_bethreads_fail.cpp b/test/has_bethreads_fail.cpp
index 0476b734..d3f50913 100644
--- a/test/has_bethreads_fail.cpp
+++ b/test/has_bethreads_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_BETHREADS
 // This file should not compile, if it does then
 // BOOST_HAS_BETHREADS may be defined.
-// see boost_has_bethreads.cxx for more details
+// see boost_has_bethreads.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_bethreads.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_bethreads.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_BETHREADS
-#include "boost_has_bethreads.cxx"
+#include "boost_has_bethreads.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_bethreads::test();
 }  
diff --git a/test/has_bethreads_pass.cpp b/test/has_bethreads_pass.cpp
index eaba83ed..fcfa39b4 100644
--- a/test/has_bethreads_pass.cpp
+++ b/test/has_bethreads_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_BETHREADS
 // This file should compile, if it does not then
 // BOOST_HAS_BETHREADS should not be defined.
-// see boost_has_bethreads.cxx for more details
+// see boost_has_bethreads.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_bethreads.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_bethreads.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_BETHREADS
-#include "boost_has_bethreads.cxx"
+#include "boost_has_bethreads.ipp"
 #else
 namespace boost_has_bethreads = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_bethreads::test();
 }  
diff --git a/test/has_clock_gettime_fail.cpp b/test/has_clock_gettime_fail.cpp
index 636f4955..7cc7a0d4 100644
--- a/test/has_clock_gettime_fail.cpp
+++ b/test/has_clock_gettime_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_CLOCK_GETTIME
 // This file should not compile, if it does then
 // BOOST_HAS_CLOCK_GETTIME may be defined.
-// see boost_has_clock_gettime.cxx for more details
+// see boost_has_clock_gettime.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_clock_gettime.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_clock_gettime.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_CLOCK_GETTIME
-#include "boost_has_clock_gettime.cxx"
+#include "boost_has_clock_gettime.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_clock_gettime::test();
 }  
diff --git a/test/has_clock_gettime_pass.cpp b/test/has_clock_gettime_pass.cpp
index ddd449d2..ee2c817f 100644
--- a/test/has_clock_gettime_pass.cpp
+++ b/test/has_clock_gettime_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_CLOCK_GETTIME
 // This file should compile, if it does not then
 // BOOST_HAS_CLOCK_GETTIME should not be defined.
-// see boost_has_clock_gettime.cxx for more details
+// see boost_has_clock_gettime.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_clock_gettime.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_clock_gettime.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_CLOCK_GETTIME
-#include "boost_has_clock_gettime.cxx"
+#include "boost_has_clock_gettime.ipp"
 #else
 namespace boost_has_clock_gettime = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_clock_gettime::test();
 }  
diff --git a/test/has_dirent_h_fail.cpp b/test/has_dirent_h_fail.cpp
index 28ebcced..2e622ffd 100644
--- a/test/has_dirent_h_fail.cpp
+++ b/test/has_dirent_h_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_DIRENT_H
 // This file should not compile, if it does then
 // BOOST_HAS_DIRENT_H may be defined.
-// see boost_has_dirent_h.cxx for more details
+// see boost_has_dirent_h.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_dirent_h.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_dirent_h.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_DIRENT_H
-#include "boost_has_dirent_h.cxx"
+#include "boost_has_dirent_h.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_dirent_h::test();
 }  
diff --git a/test/has_dirent_h_pass.cpp b/test/has_dirent_h_pass.cpp
index 4f2d04bb..6d9a0c65 100644
--- a/test/has_dirent_h_pass.cpp
+++ b/test/has_dirent_h_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_DIRENT_H
 // This file should compile, if it does not then
 // BOOST_HAS_DIRENT_H should not be defined.
-// see boost_has_dirent_h.cxx for more details
+// see boost_has_dirent_h.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_dirent_h.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_dirent_h.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_DIRENT_H
-#include "boost_has_dirent_h.cxx"
+#include "boost_has_dirent_h.ipp"
 #else
 namespace boost_has_dirent_h = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_dirent_h::test();
 }  
diff --git a/test/has_ftime_fail.cpp b/test/has_ftime_fail.cpp
index 48957502..ef458a7b 100644
--- a/test/has_ftime_fail.cpp
+++ b/test/has_ftime_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_FTIME
 // This file should not compile, if it does then
 // BOOST_HAS_FTIME may be defined.
-// see boost_has_ftime.cxx for more details
+// see boost_has_ftime.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_ftime.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_ftime.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_FTIME
-#include "boost_has_ftime.cxx"
+#include "boost_has_ftime.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_ftime::test();
 }  
diff --git a/test/has_ftime_pass.cpp b/test/has_ftime_pass.cpp
index 5e184b0d..530c396c 100644
--- a/test/has_ftime_pass.cpp
+++ b/test/has_ftime_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_FTIME
 // This file should compile, if it does not then
 // BOOST_HAS_FTIME should not be defined.
-// see boost_has_ftime.cxx for more details
+// see boost_has_ftime.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_ftime.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_ftime.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_FTIME
-#include "boost_has_ftime.cxx"
+#include "boost_has_ftime.ipp"
 #else
 namespace boost_has_ftime = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_ftime::test();
 }  
diff --git a/test/has_gettimeofday_fail.cpp b/test/has_gettimeofday_fail.cpp
index 6abf3934..e1999db9 100644
--- a/test/has_gettimeofday_fail.cpp
+++ b/test/has_gettimeofday_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_GETTIMEOFDAY
 // This file should not compile, if it does then
 // BOOST_HAS_GETTIMEOFDAY may be defined.
-// see boost_has_gettimeofday.cxx for more details
+// see boost_has_gettimeofday.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_gettimeofday.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_gettimeofday.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_GETTIMEOFDAY
-#include "boost_has_gettimeofday.cxx"
+#include "boost_has_gettimeofday.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_gettimeofday::test();
 }  
diff --git a/test/has_gettimeofday_pass.cpp b/test/has_gettimeofday_pass.cpp
index 22831fa2..26d26bc9 100644
--- a/test/has_gettimeofday_pass.cpp
+++ b/test/has_gettimeofday_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_GETTIMEOFDAY
 // This file should compile, if it does not then
 // BOOST_HAS_GETTIMEOFDAY should not be defined.
-// see boost_has_gettimeofday.cxx for more details
+// see boost_has_gettimeofday.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_gettimeofday.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_gettimeofday.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_GETTIMEOFDAY
-#include "boost_has_gettimeofday.cxx"
+#include "boost_has_gettimeofday.ipp"
 #else
 namespace boost_has_gettimeofday = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_gettimeofday::test();
 }  
diff --git a/test/has_hash_fail.cpp b/test/has_hash_fail.cpp
index 743e04f9..8f9fae7b 100644
--- a/test/has_hash_fail.cpp
+++ b/test/has_hash_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_HASH
 // This file should not compile, if it does then
 // BOOST_HAS_HASH may be defined.
-// see boost_has_hash.cxx for more details
+// see boost_has_hash.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_hash.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_hash.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_HASH
-#include "boost_has_hash.cxx"
+#include "boost_has_hash.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_hash::test();
 }  
diff --git a/test/has_hash_pass.cpp b/test/has_hash_pass.cpp
index 7b52e078..a86a6322 100644
--- a/test/has_hash_pass.cpp
+++ b/test/has_hash_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_HASH
 // This file should compile, if it does not then
 // BOOST_HAS_HASH should not be defined.
-// see boost_has_hash.cxx for more details
+// see boost_has_hash.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_hash.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_hash.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_HASH
-#include "boost_has_hash.cxx"
+#include "boost_has_hash.ipp"
 #else
 namespace boost_has_hash = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_hash::test();
 }  
diff --git a/test/has_long_long_fail.cpp b/test/has_long_long_fail.cpp
index fb243d04..accd837a 100644
--- a/test/has_long_long_fail.cpp
+++ b/test/has_long_long_fail.cpp
@@ -8,11 +8,11 @@
 // 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
+// see boost_has_long_long.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_long_long.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_long_long.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_LONG_LONG
-#include "boost_has_long_long.cxx"
+#include "boost_has_long_long.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int 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
index 60eba516..1d5b12a0 100644
--- a/test/has_long_long_pass.cpp
+++ b/test/has_long_long_pass.cpp
@@ -8,11 +8,11 @@
 // 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
+// see boost_has_long_long.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_long_long.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_long_long.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_LONG_LONG
-#include "boost_has_long_long.cxx"
+#include "boost_has_long_long.ipp"
 #else
 namespace boost_has_long_long = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_long_long::test();
 }  
diff --git a/test/has_macro_use_facet_fail.cpp b/test/has_macro_use_facet_fail.cpp
index a825ae05..666010f1 100644
--- a/test/has_macro_use_facet_fail.cpp
+++ b/test/has_macro_use_facet_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_MACRO_USE_FACET
 // This file should not compile, if it does then
 // BOOST_HAS_MACRO_USE_FACET may be defined.
-// see boost_has_macro_use_facet.cxx for more details
+// see boost_has_macro_use_facet.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_macro_use_facet.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_macro_use_facet.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_MACRO_USE_FACET
-#include "boost_has_macro_use_facet.cxx"
+#include "boost_has_macro_use_facet.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_macro_use_facet::test();
 }  
diff --git a/test/has_macro_use_facet_pass.cpp b/test/has_macro_use_facet_pass.cpp
index fdc934dd..b3d775b3 100644
--- a/test/has_macro_use_facet_pass.cpp
+++ b/test/has_macro_use_facet_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_MACRO_USE_FACET
 // This file should compile, if it does not then
 // BOOST_HAS_MACRO_USE_FACET should not be defined.
-// see boost_has_macro_use_facet.cxx for more details
+// see boost_has_macro_use_facet.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_macro_use_facet.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_macro_use_facet.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_MACRO_USE_FACET
-#include "boost_has_macro_use_facet.cxx"
+#include "boost_has_macro_use_facet.ipp"
 #else
 namespace boost_has_macro_use_facet = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_macro_use_facet::test();
 }  
diff --git a/test/has_ms_int64_fail.cpp b/test/has_ms_int64_fail.cpp
index 3737e035..22221397 100644
--- a/test/has_ms_int64_fail.cpp
+++ b/test/has_ms_int64_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_MS_INT64
 // This file should not compile, if it does then
 // BOOST_HAS_MS_INT64 may be defined.
-// see boost_has_ms_int64.cxx for more details
+// see boost_has_ms_int64.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_ms_int64.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_ms_int64.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_MS_INT64
-#include "boost_has_ms_int64.cxx"
+#include "boost_has_ms_int64.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_ms_int64::test();
 }  
diff --git a/test/has_ms_int64_pass.cpp b/test/has_ms_int64_pass.cpp
index 40df72a0..0d6b5d65 100644
--- a/test/has_ms_int64_pass.cpp
+++ b/test/has_ms_int64_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_MS_INT64
 // This file should compile, if it does not then
 // BOOST_HAS_MS_INT64 should not be defined.
-// see boost_has_ms_int64.cxx for more details
+// see boost_has_ms_int64.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_ms_int64.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_ms_int64.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_MS_INT64
-#include "boost_has_ms_int64.cxx"
+#include "boost_has_ms_int64.ipp"
 #else
 namespace boost_has_ms_int64 = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_ms_int64::test();
 }  
diff --git a/test/has_nanosleep_fail.cpp b/test/has_nanosleep_fail.cpp
index 1aec15a8..34a44638 100644
--- a/test/has_nanosleep_fail.cpp
+++ b/test/has_nanosleep_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_NANOSLEEP
 // This file should not compile, if it does then
 // BOOST_HAS_NANOSLEEP may be defined.
-// see boost_has_nanosleep.cxx for more details
+// see boost_has_nanosleep.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_nanosleep.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_nanosleep.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_NANOSLEEP
-#include "boost_has_nanosleep.cxx"
+#include "boost_has_nanosleep.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_nanosleep::test();
 }  
diff --git a/test/has_nanosleep_pass.cpp b/test/has_nanosleep_pass.cpp
index 0fa6cee7..99ea4f7a 100644
--- a/test/has_nanosleep_pass.cpp
+++ b/test/has_nanosleep_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_NANOSLEEP
 // This file should compile, if it does not then
 // BOOST_HAS_NANOSLEEP should not be defined.
-// see boost_has_nanosleep.cxx for more details
+// see boost_has_nanosleep.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_nanosleep.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_nanosleep.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_NANOSLEEP
-#include "boost_has_nanosleep.cxx"
+#include "boost_has_nanosleep.ipp"
 #else
 namespace boost_has_nanosleep = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_nanosleep::test();
 }  
diff --git a/test/has_nl_types_h_fail.cpp b/test/has_nl_types_h_fail.cpp
index fbb2d01b..d4252ede 100644
--- a/test/has_nl_types_h_fail.cpp
+++ b/test/has_nl_types_h_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_NL_TYPES_H
 // This file should not compile, if it does then
 // BOOST_HAS_NL_TYPES_H may be defined.
-// see boost_has_nl_types_h.cxx for more details
+// see boost_has_nl_types_h.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_nl_types_h.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_nl_types_h.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_NL_TYPES_H
-#include "boost_has_nl_types_h.cxx"
+#include "boost_has_nl_types_h.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_nl_types_h::test();
 }  
diff --git a/test/has_nl_types_h_pass.cpp b/test/has_nl_types_h_pass.cpp
index 2c14ce44..ce954284 100644
--- a/test/has_nl_types_h_pass.cpp
+++ b/test/has_nl_types_h_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_NL_TYPES_H
 // This file should compile, if it does not then
 // BOOST_HAS_NL_TYPES_H should not be defined.
-// see boost_has_nl_types_h.cxx for more details
+// see boost_has_nl_types_h.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_nl_types_h.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_nl_types_h.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_NL_TYPES_H
-#include "boost_has_nl_types_h.cxx"
+#include "boost_has_nl_types_h.ipp"
 #else
 namespace boost_has_nl_types_h = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_nl_types_h::test();
 }  
diff --git a/test/has_nrvo_fail.cpp b/test/has_nrvo_fail.cpp
index ac2760f2..9c86c0d6 100644
--- a/test/has_nrvo_fail.cpp
+++ b/test/has_nrvo_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_NRVO
 // This file should not compile, if it does then
 // BOOST_HAS_NRVO may be defined.
-// see boost_has_nrvo.cxx for more details
+// see boost_has_nrvo.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_nrvo.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_nrvo.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_NRVO
-#include "boost_has_nrvo.cxx"
+#include "boost_has_nrvo.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_nrvo::test();
 }  
diff --git a/test/has_nrvo_pass.cpp b/test/has_nrvo_pass.cpp
index cdaf9aae..5cb5e14f 100644
--- a/test/has_nrvo_pass.cpp
+++ b/test/has_nrvo_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_NRVO
 // This file should compile, if it does not then
 // BOOST_HAS_NRVO should not be defined.
-// see boost_has_nrvo.cxx for more details
+// see boost_has_nrvo.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_nrvo.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_nrvo.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_NRVO
-#include "boost_has_nrvo.cxx"
+#include "boost_has_nrvo.ipp"
 #else
 namespace boost_has_nrvo = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_nrvo::test();
 }  
diff --git a/test/has_part_alloc_fail.cpp b/test/has_part_alloc_fail.cpp
index 5c74cd33..dbabdfb5 100644
--- a/test/has_part_alloc_fail.cpp
+++ b/test/has_part_alloc_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_PARTIAL_STD_ALLOCATOR
 // This file should not compile, if it does then
 // BOOST_HAS_PARTIAL_STD_ALLOCATOR may be defined.
-// see boost_has_part_alloc.cxx for more details
+// see boost_has_part_alloc.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_part_alloc.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_part_alloc.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_PARTIAL_STD_ALLOCATOR
-#include "boost_has_part_alloc.cxx"
+#include "boost_has_part_alloc.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_partial_std_allocator::test();
 }  
diff --git a/test/has_part_alloc_pass.cpp b/test/has_part_alloc_pass.cpp
index 632da5ea..d5ae729b 100644
--- a/test/has_part_alloc_pass.cpp
+++ b/test/has_part_alloc_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_PARTIAL_STD_ALLOCATOR
 // This file should compile, if it does not then
 // BOOST_HAS_PARTIAL_STD_ALLOCATOR should not be defined.
-// see boost_has_part_alloc.cxx for more details
+// see boost_has_part_alloc.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_part_alloc.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_part_alloc.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_PARTIAL_STD_ALLOCATOR
-#include "boost_has_part_alloc.cxx"
+#include "boost_has_part_alloc.ipp"
 #else
 namespace boost_has_partial_std_allocator = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_partial_std_allocator::test();
 }  
diff --git a/test/has_pthread_delay_np_fail.cpp b/test/has_pthread_delay_np_fail.cpp
index 4a7edb4e..921b2310 100644
--- a/test/has_pthread_delay_np_fail.cpp
+++ b/test/has_pthread_delay_np_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_PTHREAD_DELAY_NP
 // This file should not compile, if it does then
 // BOOST_HAS_PTHREAD_DELAY_NP may be defined.
-// see boost_has_pthread_delay_np.cxx for more details
+// see boost_has_pthread_delay_np.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_pthread_delay_np.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_pthread_delay_np.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_PTHREAD_DELAY_NP
-#include "boost_has_pthread_delay_np.cxx"
+#include "boost_has_pthread_delay_np.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_pthread_delay_np::test();
 }  
diff --git a/test/has_pthread_delay_np_pass.cpp b/test/has_pthread_delay_np_pass.cpp
index c539e04e..02e61d3b 100644
--- a/test/has_pthread_delay_np_pass.cpp
+++ b/test/has_pthread_delay_np_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_PTHREAD_DELAY_NP
 // This file should compile, if it does not then
 // BOOST_HAS_PTHREAD_DELAY_NP should not be defined.
-// see boost_has_pthread_delay_np.cxx for more details
+// see boost_has_pthread_delay_np.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_pthread_delay_np.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_pthread_delay_np.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_PTHREAD_DELAY_NP
-#include "boost_has_pthread_delay_np.cxx"
+#include "boost_has_pthread_delay_np.ipp"
 #else
 namespace boost_has_pthread_delay_np = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_pthread_delay_np::test();
 }  
diff --git a/test/has_pthread_ma_st_fail.cpp b/test/has_pthread_ma_st_fail.cpp
index 648ead1d..c1b00604 100644
--- a/test/has_pthread_ma_st_fail.cpp
+++ b/test/has_pthread_ma_st_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
 // This file should not compile, if it does then
 // BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE may be defined.
-// see boost_has_pthread_ma_st.cxx for more details
+// see boost_has_pthread_ma_st.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_pthread_ma_st.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_pthread_ma_st.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
-#include "boost_has_pthread_ma_st.cxx"
+#include "boost_has_pthread_ma_st.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_pthread_mutexattr_settype::test();
 }  
diff --git a/test/has_pthread_ma_st_pass.cpp b/test/has_pthread_ma_st_pass.cpp
index 0027d7f7..f35c3f19 100644
--- a/test/has_pthread_ma_st_pass.cpp
+++ b/test/has_pthread_ma_st_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
 // This file should compile, if it does not then
 // BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE should not be defined.
-// see boost_has_pthread_ma_st.cxx for more details
+// see boost_has_pthread_ma_st.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_pthread_ma_st.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_pthread_ma_st.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
-#include "boost_has_pthread_ma_st.cxx"
+#include "boost_has_pthread_ma_st.ipp"
 #else
 namespace boost_has_pthread_mutexattr_settype = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_pthread_mutexattr_settype::test();
 }  
diff --git a/test/has_pthread_yield_fail.cpp b/test/has_pthread_yield_fail.cpp
index dacebb09..b2d1b010 100644
--- a/test/has_pthread_yield_fail.cpp
+++ b/test/has_pthread_yield_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_PTHREAD_YIELD
 // This file should not compile, if it does then
 // BOOST_HAS_PTHREAD_YIELD may be defined.
-// see boost_has_pthread_yield.cxx for more details
+// see boost_has_pthread_yield.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_pthread_yield.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_pthread_yield.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_PTHREAD_YIELD
-#include "boost_has_pthread_yield.cxx"
+#include "boost_has_pthread_yield.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_pthread_yield::test();
 }  
diff --git a/test/has_pthread_yield_pass.cpp b/test/has_pthread_yield_pass.cpp
index e9052cce..421581ff 100644
--- a/test/has_pthread_yield_pass.cpp
+++ b/test/has_pthread_yield_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_PTHREAD_YIELD
 // This file should compile, if it does not then
 // BOOST_HAS_PTHREAD_YIELD should not be defined.
-// see boost_has_pthread_yield.cxx for more details
+// see boost_has_pthread_yield.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_pthread_yield.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_pthread_yield.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_PTHREAD_YIELD
-#include "boost_has_pthread_yield.cxx"
+#include "boost_has_pthread_yield.ipp"
 #else
 namespace boost_has_pthread_yield = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_pthread_yield::test();
 }  
diff --git a/test/has_pthreads_fail.cpp b/test/has_pthreads_fail.cpp
index 2a63b179..d5635230 100644
--- a/test/has_pthreads_fail.cpp
+++ b/test/has_pthreads_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_PTHREADS
 // This file should not compile, if it does then
 // BOOST_HAS_PTHREADS may be defined.
-// see boost_has_pthreads.cxx for more details
+// see boost_has_pthreads.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_pthreads.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_pthreads.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_PTHREADS
-#include "boost_has_pthreads.cxx"
+#include "boost_has_pthreads.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_pthreads::test();
 }  
diff --git a/test/has_pthreads_pass.cpp b/test/has_pthreads_pass.cpp
index d74530fd..185b7a7e 100644
--- a/test/has_pthreads_pass.cpp
+++ b/test/has_pthreads_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_PTHREADS
 // This file should compile, if it does not then
 // BOOST_HAS_PTHREADS should not be defined.
-// see boost_has_pthreads.cxx for more details
+// see boost_has_pthreads.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_pthreads.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_pthreads.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_PTHREADS
-#include "boost_has_pthreads.cxx"
+#include "boost_has_pthreads.ipp"
 #else
 namespace boost_has_pthreads = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_pthreads::test();
 }  
diff --git a/test/has_sched_yield_fail.cpp b/test/has_sched_yield_fail.cpp
index 016ee63c..9fa185eb 100644
--- a/test/has_sched_yield_fail.cpp
+++ b/test/has_sched_yield_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_SCHED_YIELD
 // This file should not compile, if it does then
 // BOOST_HAS_SCHED_YIELD may be defined.
-// see boost_has_sched_yield.cxx for more details
+// see boost_has_sched_yield.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_sched_yield.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_sched_yield.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_SCHED_YIELD
-#include "boost_has_sched_yield.cxx"
+#include "boost_has_sched_yield.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_sched_yield::test();
 }  
diff --git a/test/has_sched_yield_pass.cpp b/test/has_sched_yield_pass.cpp
index 62aa933a..fe5cff4a 100644
--- a/test/has_sched_yield_pass.cpp
+++ b/test/has_sched_yield_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_SCHED_YIELD
 // This file should compile, if it does not then
 // BOOST_HAS_SCHED_YIELD should not be defined.
-// see boost_has_sched_yield.cxx for more details
+// see boost_has_sched_yield.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_sched_yield.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_sched_yield.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_SCHED_YIELD
-#include "boost_has_sched_yield.cxx"
+#include "boost_has_sched_yield.ipp"
 #else
 namespace boost_has_sched_yield = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_sched_yield::test();
 }  
diff --git a/test/has_sgi_type_traits_fail.cpp b/test/has_sgi_type_traits_fail.cpp
index 725a9a42..fe983663 100644
--- a/test/has_sgi_type_traits_fail.cpp
+++ b/test/has_sgi_type_traits_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_SGI_TYPE_TRAITS
 // This file should not compile, if it does then
 // BOOST_HAS_SGI_TYPE_TRAITS may be defined.
-// see boost_has_sgi_type_traits.cxx for more details
+// see boost_has_sgi_type_traits.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_sgi_type_traits.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_sgi_type_traits.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_SGI_TYPE_TRAITS
-#include "boost_has_sgi_type_traits.cxx"
+#include "boost_has_sgi_type_traits.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_sgi_type_traits::test();
 }  
diff --git a/test/has_sgi_type_traits_pass.cpp b/test/has_sgi_type_traits_pass.cpp
index 745d147c..8c38194f 100644
--- a/test/has_sgi_type_traits_pass.cpp
+++ b/test/has_sgi_type_traits_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_SGI_TYPE_TRAITS
 // This file should compile, if it does not then
 // BOOST_HAS_SGI_TYPE_TRAITS should not be defined.
-// see boost_has_sgi_type_traits.cxx for more details
+// see boost_has_sgi_type_traits.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_sgi_type_traits.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_sgi_type_traits.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_SGI_TYPE_TRAITS
-#include "boost_has_sgi_type_traits.cxx"
+#include "boost_has_sgi_type_traits.ipp"
 #else
 namespace boost_has_sgi_type_traits = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_sgi_type_traits::test();
 }  
diff --git a/test/has_sigaction_fail.cpp b/test/has_sigaction_fail.cpp
index 97409860..8e2d0408 100644
--- a/test/has_sigaction_fail.cpp
+++ b/test/has_sigaction_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_SIGACTION
 // This file should not compile, if it does then
 // BOOST_HAS_SIGACTION may be defined.
-// see boost_has_sigaction.cxx for more details
+// see boost_has_sigaction.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_sigaction.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_sigaction.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_SIGACTION
-#include "boost_has_sigaction.cxx"
+#include "boost_has_sigaction.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_sigaction::test();
 }  
diff --git a/test/has_sigaction_pass.cpp b/test/has_sigaction_pass.cpp
index 968ca5d4..7e333320 100644
--- a/test/has_sigaction_pass.cpp
+++ b/test/has_sigaction_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_SIGACTION
 // This file should compile, if it does not then
 // BOOST_HAS_SIGACTION should not be defined.
-// see boost_has_sigaction.cxx for more details
+// see boost_has_sigaction.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_sigaction.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_sigaction.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_SIGACTION
-#include "boost_has_sigaction.cxx"
+#include "boost_has_sigaction.ipp"
 #else
 namespace boost_has_sigaction = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_sigaction::test();
 }  
diff --git a/test/has_slist_fail.cpp b/test/has_slist_fail.cpp
index f4dce82c..328b4187 100644
--- a/test/has_slist_fail.cpp
+++ b/test/has_slist_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_SLIST
 // This file should not compile, if it does then
 // BOOST_HAS_SLIST may be defined.
-// see boost_has_slist.cxx for more details
+// see boost_has_slist.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_slist.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_slist.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_SLIST
-#include "boost_has_slist.cxx"
+#include "boost_has_slist.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_slist::test();
 }  
diff --git a/test/has_slist_pass.cpp b/test/has_slist_pass.cpp
index 4f0b343e..4a3d2aeb 100644
--- a/test/has_slist_pass.cpp
+++ b/test/has_slist_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_SLIST
 // This file should compile, if it does not then
 // BOOST_HAS_SLIST should not be defined.
-// see boost_has_slist.cxx for more details
+// see boost_has_slist.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_slist.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_slist.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_SLIST
-#include "boost_has_slist.cxx"
+#include "boost_has_slist.ipp"
 #else
 namespace boost_has_slist = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_slist::test();
 }  
diff --git a/test/has_stdint_h_fail.cpp b/test/has_stdint_h_fail.cpp
index f1f25e58..662bc1b1 100644
--- a/test/has_stdint_h_fail.cpp
+++ b/test/has_stdint_h_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_STDINT_H
 // This file should not compile, if it does then
 // BOOST_HAS_STDINT_H may be defined.
-// see boost_has_stdint_h.cxx for more details
+// see boost_has_stdint_h.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_stdint_h.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_stdint_h.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_STDINT_H
-#include "boost_has_stdint_h.cxx"
+#include "boost_has_stdint_h.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_stdint_h::test();
 }  
diff --git a/test/has_stdint_h_pass.cpp b/test/has_stdint_h_pass.cpp
index 573ab141..6500311e 100644
--- a/test/has_stdint_h_pass.cpp
+++ b/test/has_stdint_h_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_STDINT_H
 // This file should compile, if it does not then
 // BOOST_HAS_STDINT_H should not be defined.
-// see boost_has_stdint_h.cxx for more details
+// see boost_has_stdint_h.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_stdint_h.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_stdint_h.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_STDINT_H
-#include "boost_has_stdint_h.cxx"
+#include "boost_has_stdint_h.ipp"
 #else
 namespace boost_has_stdint_h = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_stdint_h::test();
 }  
diff --git a/test/has_stlp_use_facet_fail.cpp b/test/has_stlp_use_facet_fail.cpp
index 2e3bdff3..16dbd30c 100644
--- a/test/has_stlp_use_facet_fail.cpp
+++ b/test/has_stlp_use_facet_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_STLP_USE_FACET
 // This file should not compile, if it does then
 // BOOST_HAS_STLP_USE_FACET may be defined.
-// see boost_has_stlp_use_facet.cxx for more details
+// see boost_has_stlp_use_facet.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_stlp_use_facet.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_stlp_use_facet.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_STLP_USE_FACET
-#include "boost_has_stlp_use_facet.cxx"
+#include "boost_has_stlp_use_facet.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_stlp_use_facet::test();
 }  
diff --git a/test/has_stlp_use_facet_pass.cpp b/test/has_stlp_use_facet_pass.cpp
index ad12503a..825f20ef 100644
--- a/test/has_stlp_use_facet_pass.cpp
+++ b/test/has_stlp_use_facet_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_STLP_USE_FACET
 // This file should compile, if it does not then
 // BOOST_HAS_STLP_USE_FACET should not be defined.
-// see boost_has_stlp_use_facet.cxx for more details
+// see boost_has_stlp_use_facet.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_stlp_use_facet.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_stlp_use_facet.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_STLP_USE_FACET
-#include "boost_has_stlp_use_facet.cxx"
+#include "boost_has_stlp_use_facet.ipp"
 #else
 namespace boost_has_stlp_use_facet = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_stlp_use_facet::test();
 }  
diff --git a/test/has_unistd_h_fail.cpp b/test/has_unistd_h_fail.cpp
index f1423a38..42aaf531 100644
--- a/test/has_unistd_h_fail.cpp
+++ b/test/has_unistd_h_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_UNISTD_H
 // This file should not compile, if it does then
 // BOOST_HAS_UNISTD_H may be defined.
-// see boost_has_unistd_h.cxx for more details
+// see boost_has_unistd_h.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_unistd_h.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_unistd_h.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_UNISTD_H
-#include "boost_has_unistd_h.cxx"
+#include "boost_has_unistd_h.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_unistd_h::test();
 }  
diff --git a/test/has_unistd_h_pass.cpp b/test/has_unistd_h_pass.cpp
index 98e932e8..041de18a 100644
--- a/test/has_unistd_h_pass.cpp
+++ b/test/has_unistd_h_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_UNISTD_H
 // This file should compile, if it does not then
 // BOOST_HAS_UNISTD_H should not be defined.
-// see boost_has_unistd_h.cxx for more details
+// see boost_has_unistd_h.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_unistd_h.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_unistd_h.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_UNISTD_H
-#include "boost_has_unistd_h.cxx"
+#include "boost_has_unistd_h.ipp"
 #else
 namespace boost_has_unistd_h = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_unistd_h::test();
 }  
diff --git a/test/has_vc6_mem_templ_fail.cpp b/test/has_vc6_mem_templ_fail.cpp
index 5c92a7bd..a5eed0a8 100644
--- a/test/has_vc6_mem_templ_fail.cpp
+++ b/test/has_vc6_mem_templ_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_MSVC6_MEMBER_TEMPLATES
 // This file should not compile, if it does then
 // BOOST_MSVC6_MEMBER_TEMPLATES may be defined.
-// see boost_has_vc6_mem_templ.cxx for more details
+// see boost_has_vc6_mem_templ.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_vc6_mem_templ.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_vc6_mem_templ.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_MSVC6_MEMBER_TEMPLATES
-#include "boost_has_vc6_mem_templ.cxx"
+#include "boost_has_vc6_mem_templ.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_msvc6_member_templates::test();
 }  
diff --git a/test/has_vc6_mem_templ_pass.cpp b/test/has_vc6_mem_templ_pass.cpp
index acd4cf77..8da16a92 100644
--- a/test/has_vc6_mem_templ_pass.cpp
+++ b/test/has_vc6_mem_templ_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_MSVC6_MEMBER_TEMPLATES
 // This file should compile, if it does not then
 // BOOST_MSVC6_MEMBER_TEMPLATES should not be defined.
-// see boost_has_vc6_mem_templ.cxx for more details
+// see boost_has_vc6_mem_templ.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_vc6_mem_templ.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_vc6_mem_templ.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_MSVC6_MEMBER_TEMPLATES
-#include "boost_has_vc6_mem_templ.cxx"
+#include "boost_has_vc6_mem_templ.ipp"
 #else
 namespace boost_msvc6_member_templates = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_msvc6_member_templates::test();
 }  
diff --git a/test/has_vc_iterator_fail.cpp b/test/has_vc_iterator_fail.cpp
index e4c4539f..6bce5ad1 100644
--- a/test/has_vc_iterator_fail.cpp
+++ b/test/has_vc_iterator_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_MSVC_STD_ITERATOR
 // This file should not compile, if it does then
 // BOOST_MSVC_STD_ITERATOR may be defined.
-// see boost_has_vc_iterator.cxx for more details
+// see boost_has_vc_iterator.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_vc_iterator.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_vc_iterator.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_MSVC_STD_ITERATOR
-#include "boost_has_vc_iterator.cxx"
+#include "boost_has_vc_iterator.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_msvc_std_iterator::test();
 }  
diff --git a/test/has_vc_iterator_pass.cpp b/test/has_vc_iterator_pass.cpp
index 03566f99..16a69528 100644
--- a/test/has_vc_iterator_pass.cpp
+++ b/test/has_vc_iterator_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_MSVC_STD_ITERATOR
 // This file should compile, if it does not then
 // BOOST_MSVC_STD_ITERATOR should not be defined.
-// see boost_has_vc_iterator.cxx for more details
+// see boost_has_vc_iterator.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_vc_iterator.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_vc_iterator.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_MSVC_STD_ITERATOR
-#include "boost_has_vc_iterator.cxx"
+#include "boost_has_vc_iterator.ipp"
 #else
 namespace boost_msvc_std_iterator = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_msvc_std_iterator::test();
 }  
diff --git a/test/has_winthreads_fail.cpp b/test/has_winthreads_fail.cpp
index e4a33a37..1b485161 100644
--- a/test/has_winthreads_fail.cpp
+++ b/test/has_winthreads_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_WINTHREADS
 // This file should not compile, if it does then
 // BOOST_HAS_WINTHREADS may be defined.
-// see boost_has_winthreads.cxx for more details
+// see boost_has_winthreads.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_winthreads.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_winthreads.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_WINTHREADS
-#include "boost_has_winthreads.cxx"
+#include "boost_has_winthreads.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_winthreads::test();
 }  
diff --git a/test/has_winthreads_pass.cpp b/test/has_winthreads_pass.cpp
index 1e17e8a5..e0c7a418 100644
--- a/test/has_winthreads_pass.cpp
+++ b/test/has_winthreads_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_HAS_WINTHREADS
 // This file should compile, if it does not then
 // BOOST_HAS_WINTHREADS should not be defined.
-// see boost_has_winthreads.cxx for more details
+// see boost_has_winthreads.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_winthreads.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_has_winthreads.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_WINTHREADS
-#include "boost_has_winthreads.cxx"
+#include "boost_has_winthreads.ipp"
 #else
 namespace boost_has_winthreads = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_has_winthreads::test();
 }  
diff --git a/test/no_arg_dep_lookup_fail.cpp b/test/no_arg_dep_lookup_fail.cpp
index 3f733a0b..54a0ed35 100644
--- a/test/no_arg_dep_lookup_fail.cpp
+++ b/test/no_arg_dep_lookup_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
 // This file should not compile, if it does then
 // BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP need not be defined.
-// see boost_no_arg_dep_lookup.cxx for more details
+// see boost_no_arg_dep_lookup.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_arg_dep_lookup.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_arg_dep_lookup.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-#include "boost_no_arg_dep_lookup.cxx"
+#include "boost_no_arg_dep_lookup.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_argument_dependent_lookup::test();
 }  
diff --git a/test/no_arg_dep_lookup_pass.cpp b/test/no_arg_dep_lookup_pass.cpp
index 0c5c21f2..4f57c669 100644
--- a/test/no_arg_dep_lookup_pass.cpp
+++ b/test/no_arg_dep_lookup_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
 // This file should compile, if it does not then
 // BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP needs to be defined.
-// see boost_no_arg_dep_lookup.cxx for more details
+// see boost_no_arg_dep_lookup.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_arg_dep_lookup.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_arg_dep_lookup.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-#include "boost_no_arg_dep_lookup.cxx"
+#include "boost_no_arg_dep_lookup.ipp"
 #else
 namespace boost_no_argument_dependent_lookup = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_argument_dependent_lookup::test();
 }  
diff --git a/test/no_array_type_spec_fail.cpp b/test/no_array_type_spec_fail.cpp
index a4577a51..fc38efa3 100644
--- a/test/no_array_type_spec_fail.cpp
+++ b/test/no_array_type_spec_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS
 // This file should not compile, if it does then
 // BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS need not be defined.
-// see boost_no_array_type_spec.cxx for more details
+// see boost_no_array_type_spec.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_array_type_spec.cxx on
-// Sat Dec 13 12:29:38 GMTST 2003
+// ../tools/generate from boost_no_array_type_spec.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS
-#include "boost_no_array_type_spec.cxx"
+#include "boost_no_array_type_spec.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_array_type_specializations::test();
 }  
diff --git a/test/no_array_type_spec_pass.cpp b/test/no_array_type_spec_pass.cpp
index 8b395ffa..20e6ed5e 100644
--- a/test/no_array_type_spec_pass.cpp
+++ b/test/no_array_type_spec_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS
 // This file should compile, if it does not then
 // BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS needs to be defined.
-// see boost_no_array_type_spec.cxx for more details
+// see boost_no_array_type_spec.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_array_type_spec.cxx on
-// Sat Dec 13 12:29:38 GMTST 2003
+// ../tools/generate from boost_no_array_type_spec.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS
-#include "boost_no_array_type_spec.cxx"
+#include "boost_no_array_type_spec.ipp"
 #else
 namespace boost_no_array_type_specializations = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_array_type_specializations::test();
 }  
diff --git a/test/no_auto_ptr_fail.cpp b/test/no_auto_ptr_fail.cpp
index 978e3756..00194bc0 100644
--- a/test/no_auto_ptr_fail.cpp
+++ b/test/no_auto_ptr_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_AUTO_PTR
 // This file should not compile, if it does then
 // BOOST_NO_AUTO_PTR need not be defined.
-// see boost_no_auto_ptr.cxx for more details
+// see boost_no_auto_ptr.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_auto_ptr.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_auto_ptr.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_AUTO_PTR
-#include "boost_no_auto_ptr.cxx"
+#include "boost_no_auto_ptr.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_auto_ptr::test();
 }  
diff --git a/test/no_auto_ptr_pass.cpp b/test/no_auto_ptr_pass.cpp
index db83d2b5..8042a1b1 100644
--- a/test/no_auto_ptr_pass.cpp
+++ b/test/no_auto_ptr_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_AUTO_PTR
 // This file should compile, if it does not then
 // BOOST_NO_AUTO_PTR needs to be defined.
-// see boost_no_auto_ptr.cxx for more details
+// see boost_no_auto_ptr.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_auto_ptr.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_auto_ptr.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_AUTO_PTR
-#include "boost_no_auto_ptr.cxx"
+#include "boost_no_auto_ptr.ipp"
 #else
 namespace boost_no_auto_ptr = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_auto_ptr::test();
 }  
diff --git a/test/no_bcb_partial_spec_fail.cpp b/test/no_bcb_partial_spec_fail.cpp
index 87736806..72962d8e 100644
--- a/test/no_bcb_partial_spec_fail.cpp
+++ b/test/no_bcb_partial_spec_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_BCB_PARTIAL_SPECIALIZATION_BUG
 // This file should not compile, if it does then
 // BOOST_BCB_PARTIAL_SPECIALIZATION_BUG need not be defined.
-// see boost_no_bcb_partial_spec.cxx for more details
+// see boost_no_bcb_partial_spec.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_bcb_partial_spec.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_bcb_partial_spec.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_BCB_PARTIAL_SPECIALIZATION_BUG
-#include "boost_no_bcb_partial_spec.cxx"
+#include "boost_no_bcb_partial_spec.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_bcb_partial_specialization_bug::test();
 }  
diff --git a/test/no_bcb_partial_spec_pass.cpp b/test/no_bcb_partial_spec_pass.cpp
index 3e74da7f..c63ab214 100644
--- a/test/no_bcb_partial_spec_pass.cpp
+++ b/test/no_bcb_partial_spec_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_BCB_PARTIAL_SPECIALIZATION_BUG
 // This file should compile, if it does not then
 // BOOST_BCB_PARTIAL_SPECIALIZATION_BUG needs to be defined.
-// see boost_no_bcb_partial_spec.cxx for more details
+// see boost_no_bcb_partial_spec.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_bcb_partial_spec.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_bcb_partial_spec.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_BCB_PARTIAL_SPECIALIZATION_BUG
-#include "boost_no_bcb_partial_spec.cxx"
+#include "boost_no_bcb_partial_spec.ipp"
 #else
 namespace boost_bcb_partial_specialization_bug = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_bcb_partial_specialization_bug::test();
 }  
diff --git a/test/no_ctype_functions_fail.cpp b/test/no_ctype_functions_fail.cpp
index 5460b667..dc6472e2 100644
--- a/test/no_ctype_functions_fail.cpp
+++ b/test/no_ctype_functions_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_CTYPE_FUNCTIONS
 // This file should not compile, if it does then
 // BOOST_NO_CTYPE_FUNCTIONS need not be defined.
-// see boost_no_ctype_functions.cxx for more details
+// see boost_no_ctype_functions.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_ctype_functions.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_ctype_functions.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_CTYPE_FUNCTIONS
-#include "boost_no_ctype_functions.cxx"
+#include "boost_no_ctype_functions.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_ctype_functions::test();
 }  
diff --git a/test/no_ctype_functions_pass.cpp b/test/no_ctype_functions_pass.cpp
index 0978d2bf..bc25d709 100644
--- a/test/no_ctype_functions_pass.cpp
+++ b/test/no_ctype_functions_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_CTYPE_FUNCTIONS
 // This file should compile, if it does not then
 // BOOST_NO_CTYPE_FUNCTIONS needs to be defined.
-// see boost_no_ctype_functions.cxx for more details
+// see boost_no_ctype_functions.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_ctype_functions.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_ctype_functions.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_CTYPE_FUNCTIONS
-#include "boost_no_ctype_functions.cxx"
+#include "boost_no_ctype_functions.ipp"
 #else
 namespace boost_no_ctype_functions = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_ctype_functions::test();
 }  
diff --git a/test/no_cv_spec_fail.cpp b/test/no_cv_spec_fail.cpp
index 9f089621..4c2f817f 100644
--- a/test/no_cv_spec_fail.cpp
+++ b/test/no_cv_spec_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_CV_SPECIALIZATIONS
 // This file should not compile, if it does then
 // BOOST_NO_CV_SPECIALIZATIONS need not be defined.
-// see boost_no_cv_spec.cxx for more details
+// see boost_no_cv_spec.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_cv_spec.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_cv_spec.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_CV_SPECIALIZATIONS
-#include "boost_no_cv_spec.cxx"
+#include "boost_no_cv_spec.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_cv_specializations::test();
 }  
diff --git a/test/no_cv_spec_pass.cpp b/test/no_cv_spec_pass.cpp
index e0320b3a..df9dc41e 100644
--- a/test/no_cv_spec_pass.cpp
+++ b/test/no_cv_spec_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_CV_SPECIALIZATIONS
 // This file should compile, if it does not then
 // BOOST_NO_CV_SPECIALIZATIONS needs to be defined.
-// see boost_no_cv_spec.cxx for more details
+// see boost_no_cv_spec.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_cv_spec.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_cv_spec.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_CV_SPECIALIZATIONS
-#include "boost_no_cv_spec.cxx"
+#include "boost_no_cv_spec.ipp"
 #else
 namespace boost_no_cv_specializations = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_cv_specializations::test();
 }  
diff --git a/test/no_cv_void_spec_fail.cpp b/test/no_cv_void_spec_fail.cpp
index 32dd64ed..c3bebffd 100644
--- a/test/no_cv_void_spec_fail.cpp
+++ b/test/no_cv_void_spec_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_CV_VOID_SPECIALIZATIONS
 // This file should not compile, if it does then
 // BOOST_NO_CV_VOID_SPECIALIZATIONS need not be defined.
-// see boost_no_cv_void_spec.cxx for more details
+// see boost_no_cv_void_spec.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_cv_void_spec.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_cv_void_spec.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_CV_VOID_SPECIALIZATIONS
-#include "boost_no_cv_void_spec.cxx"
+#include "boost_no_cv_void_spec.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_cv_void_specializations::test();
 }  
diff --git a/test/no_cv_void_spec_pass.cpp b/test/no_cv_void_spec_pass.cpp
index 5188d071..a741400a 100644
--- a/test/no_cv_void_spec_pass.cpp
+++ b/test/no_cv_void_spec_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_CV_VOID_SPECIALIZATIONS
 // This file should compile, if it does not then
 // BOOST_NO_CV_VOID_SPECIALIZATIONS needs to be defined.
-// see boost_no_cv_void_spec.cxx for more details
+// see boost_no_cv_void_spec.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_cv_void_spec.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_cv_void_spec.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_CV_VOID_SPECIALIZATIONS
-#include "boost_no_cv_void_spec.cxx"
+#include "boost_no_cv_void_spec.ipp"
 #else
 namespace boost_no_cv_void_specializations = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_cv_void_specializations::test();
 }  
diff --git a/test/no_cwchar_fail.cpp b/test/no_cwchar_fail.cpp
index 929967b1..a10efbff 100644
--- a/test/no_cwchar_fail.cpp
+++ b/test/no_cwchar_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_CWCHAR
 // This file should not compile, if it does then
 // BOOST_NO_CWCHAR need not be defined.
-// see boost_no_cwchar.cxx for more details
+// see boost_no_cwchar.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_cwchar.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_cwchar.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_CWCHAR
-#include "boost_no_cwchar.cxx"
+#include "boost_no_cwchar.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_cwchar::test();
 }  
diff --git a/test/no_cwchar_pass.cpp b/test/no_cwchar_pass.cpp
index a38b628f..6dfe484e 100644
--- a/test/no_cwchar_pass.cpp
+++ b/test/no_cwchar_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_CWCHAR
 // This file should compile, if it does not then
 // BOOST_NO_CWCHAR needs to be defined.
-// see boost_no_cwchar.cxx for more details
+// see boost_no_cwchar.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_cwchar.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_cwchar.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_CWCHAR
-#include "boost_no_cwchar.cxx"
+#include "boost_no_cwchar.ipp"
 #else
 namespace boost_no_cwchar = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_cwchar::test();
 }  
diff --git a/test/no_cwctype_fail.cpp b/test/no_cwctype_fail.cpp
index 534d0975..432c9a69 100644
--- a/test/no_cwctype_fail.cpp
+++ b/test/no_cwctype_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_CWCTYPE
 // This file should not compile, if it does then
 // BOOST_NO_CWCTYPE need not be defined.
-// see boost_no_cwctype.cxx for more details
+// see boost_no_cwctype.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_cwctype.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_cwctype.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_CWCTYPE
-#include "boost_no_cwctype.cxx"
+#include "boost_no_cwctype.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_cwctype::test();
 }  
diff --git a/test/no_cwctype_pass.cpp b/test/no_cwctype_pass.cpp
index 7af09f1a..ea168505 100644
--- a/test/no_cwctype_pass.cpp
+++ b/test/no_cwctype_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_CWCTYPE
 // This file should compile, if it does not then
 // BOOST_NO_CWCTYPE needs to be defined.
-// see boost_no_cwctype.cxx for more details
+// see boost_no_cwctype.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_cwctype.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_cwctype.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_CWCTYPE
-#include "boost_no_cwctype.cxx"
+#include "boost_no_cwctype.ipp"
 #else
 namespace boost_no_cwctype = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_cwctype::test();
 }  
diff --git a/test/no_ded_typename_fail.cpp b/test/no_ded_typename_fail.cpp
index 024abc1a..2ae3f159 100644
--- a/test/no_ded_typename_fail.cpp
+++ b/test/no_ded_typename_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_DEDUCED_TYPENAME
 // This file should not compile, if it does then
 // BOOST_DEDUCED_TYPENAME need not be defined.
-// see boost_no_ded_typename.cxx for more details
+// see boost_no_ded_typename.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_ded_typename.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_ded_typename.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_DEDUCED_TYPENAME
-#include "boost_no_ded_typename.cxx"
+#include "boost_no_ded_typename.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_deduced_typename::test();
 }  
diff --git a/test/no_ded_typename_pass.cpp b/test/no_ded_typename_pass.cpp
index 2a00d2a2..2a568a27 100644
--- a/test/no_ded_typename_pass.cpp
+++ b/test/no_ded_typename_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_DEDUCED_TYPENAME
 // This file should compile, if it does not then
 // BOOST_DEDUCED_TYPENAME needs to be defined.
-// see boost_no_ded_typename.cxx for more details
+// see boost_no_ded_typename.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_ded_typename.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_ded_typename.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_DEDUCED_TYPENAME
-#include "boost_no_ded_typename.cxx"
+#include "boost_no_ded_typename.ipp"
 #else
 namespace boost_deduced_typename = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_deduced_typename::test();
 }  
diff --git a/test/no_dep_nested_class_fail.cpp b/test/no_dep_nested_class_fail.cpp
index a66fdae2..bd6b407f 100644
--- a/test/no_dep_nested_class_fail.cpp
+++ b/test/no_dep_nested_class_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
 // This file should not compile, if it does then
 // BOOST_NO_DEPENDENT_NESTED_DERIVATIONS need not be defined.
-// see boost_no_dep_nested_class.cxx for more details
+// see boost_no_dep_nested_class.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_dep_nested_class.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_dep_nested_class.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
-#include "boost_no_dep_nested_class.cxx"
+#include "boost_no_dep_nested_class.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_dependent_nested_derivations::test();
 }  
diff --git a/test/no_dep_nested_class_pass.cpp b/test/no_dep_nested_class_pass.cpp
index 4931cb9b..2913a6c6 100644
--- a/test/no_dep_nested_class_pass.cpp
+++ b/test/no_dep_nested_class_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
 // This file should compile, if it does not then
 // BOOST_NO_DEPENDENT_NESTED_DERIVATIONS needs to be defined.
-// see boost_no_dep_nested_class.cxx for more details
+// see boost_no_dep_nested_class.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_dep_nested_class.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_dep_nested_class.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
-#include "boost_no_dep_nested_class.cxx"
+#include "boost_no_dep_nested_class.ipp"
 #else
 namespace boost_no_dependent_nested_derivations = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_dependent_nested_derivations::test();
 }  
diff --git a/test/no_dep_val_param_fail.cpp b/test/no_dep_val_param_fail.cpp
index 125be13e..f7df730d 100644
--- a/test/no_dep_val_param_fail.cpp
+++ b/test/no_dep_val_param_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
 // This file should not compile, if it does then
 // BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS need not be defined.
-// see boost_no_dep_val_param.cxx for more details
+// see boost_no_dep_val_param.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_dep_val_param.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_dep_val_param.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
-#include "boost_no_dep_val_param.cxx"
+#include "boost_no_dep_val_param.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_dependent_types_in_template_value_parameters::test();
 }  
diff --git a/test/no_dep_val_param_pass.cpp b/test/no_dep_val_param_pass.cpp
index 1ad701d5..ad72f222 100644
--- a/test/no_dep_val_param_pass.cpp
+++ b/test/no_dep_val_param_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
 // This file should compile, if it does not then
 // BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS needs to be defined.
-// see boost_no_dep_val_param.cxx for more details
+// see boost_no_dep_val_param.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_dep_val_param.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_dep_val_param.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
-#include "boost_no_dep_val_param.cxx"
+#include "boost_no_dep_val_param.ipp"
 #else
 namespace boost_no_dependent_types_in_template_value_parameters = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_dependent_types_in_template_value_parameters::test();
 }  
diff --git a/test/no_excep_std_fail.cpp b/test/no_excep_std_fail.cpp
index 3902b03c..75f09d25 100644
--- a/test/no_excep_std_fail.cpp
+++ b/test/no_excep_std_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_EXCEPTION_STD_NAMESPACE
 // This file should not compile, if it does then
 // BOOST_NO_EXCEPTION_STD_NAMESPACE need not be defined.
-// see boost_no_excep_std.cxx for more details
+// see boost_no_excep_std.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_excep_std.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_excep_std.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE
-#include "boost_no_excep_std.cxx"
+#include "boost_no_excep_std.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_exception_std_namespace::test();
 }  
diff --git a/test/no_excep_std_pass.cpp b/test/no_excep_std_pass.cpp
index dd52655d..d505d6ac 100644
--- a/test/no_excep_std_pass.cpp
+++ b/test/no_excep_std_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_EXCEPTION_STD_NAMESPACE
 // This file should compile, if it does not then
 // BOOST_NO_EXCEPTION_STD_NAMESPACE needs to be defined.
-// see boost_no_excep_std.cxx for more details
+// see boost_no_excep_std.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_excep_std.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_excep_std.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_EXCEPTION_STD_NAMESPACE
-#include "boost_no_excep_std.cxx"
+#include "boost_no_excep_std.ipp"
 #else
 namespace boost_no_exception_std_namespace = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_exception_std_namespace::test();
 }  
diff --git a/test/no_exceptions_fail.cpp b/test/no_exceptions_fail.cpp
index 38688984..95b5774b 100644
--- a/test/no_exceptions_fail.cpp
+++ b/test/no_exceptions_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_EXCEPTIONS
 // This file should not compile, if it does then
 // BOOST_NO_EXCEPTIONS need not be defined.
-// see boost_no_exceptions.cxx for more details
+// see boost_no_exceptions.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_exceptions.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_exceptions.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_EXCEPTIONS
-#include "boost_no_exceptions.cxx"
+#include "boost_no_exceptions.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_exceptions::test();
 }  
diff --git a/test/no_exceptions_pass.cpp b/test/no_exceptions_pass.cpp
index 6fde3ee4..a1ff7193 100644
--- a/test/no_exceptions_pass.cpp
+++ b/test/no_exceptions_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_EXCEPTIONS
 // This file should compile, if it does not then
 // BOOST_NO_EXCEPTIONS needs to be defined.
-// see boost_no_exceptions.cxx for more details
+// see boost_no_exceptions.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_exceptions.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_exceptions.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_EXCEPTIONS
-#include "boost_no_exceptions.cxx"
+#include "boost_no_exceptions.ipp"
 #else
 namespace boost_no_exceptions = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_exceptions::test();
 }  
diff --git a/test/no_exp_func_tem_arg_fail.cpp b/test/no_exp_func_tem_arg_fail.cpp
index cc9ef049..7bf54961 100644
--- a/test/no_exp_func_tem_arg_fail.cpp
+++ b/test/no_exp_func_tem_arg_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
 // This file should not compile, if it does then
 // BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS need not be defined.
-// see boost_no_exp_func_tem_arg.cxx for more details
+// see boost_no_exp_func_tem_arg.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_exp_func_tem_arg.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_exp_func_tem_arg.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
-#include "boost_no_exp_func_tem_arg.cxx"
+#include "boost_no_exp_func_tem_arg.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_explicit_function_template_arguments::test();
 }  
diff --git a/test/no_exp_func_tem_arg_pass.cpp b/test/no_exp_func_tem_arg_pass.cpp
index 6c1649f8..9035f744 100644
--- a/test/no_exp_func_tem_arg_pass.cpp
+++ b/test/no_exp_func_tem_arg_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
 // This file should compile, if it does not then
 // BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS needs to be defined.
-// see boost_no_exp_func_tem_arg.cxx for more details
+// see boost_no_exp_func_tem_arg.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_exp_func_tem_arg.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_exp_func_tem_arg.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
-#include "boost_no_exp_func_tem_arg.cxx"
+#include "boost_no_exp_func_tem_arg.ipp"
 #else
 namespace boost_no_explicit_function_template_arguments = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_explicit_function_template_arguments::test();
 }  
diff --git a/test/no_func_tmp_order_fail.cpp b/test/no_func_tmp_order_fail.cpp
index dfa9699c..65647d7a 100644
--- a/test/no_func_tmp_order_fail.cpp
+++ b/test/no_func_tmp_order_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_FUNCTION_TEMPLATE_ORDERING
 // This file should not compile, if it does then
 // BOOST_NO_FUNCTION_TEMPLATE_ORDERING need not be defined.
-// see boost_no_func_tmp_order.cxx for more details
+// see boost_no_func_tmp_order.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_func_tmp_order.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_func_tmp_order.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-#include "boost_no_func_tmp_order.cxx"
+#include "boost_no_func_tmp_order.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_function_template_ordering::test();
 }  
diff --git a/test/no_func_tmp_order_pass.cpp b/test/no_func_tmp_order_pass.cpp
index fa2d7b45..8427c6b5 100644
--- a/test/no_func_tmp_order_pass.cpp
+++ b/test/no_func_tmp_order_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_FUNCTION_TEMPLATE_ORDERING
 // This file should compile, if it does not then
 // BOOST_NO_FUNCTION_TEMPLATE_ORDERING needs to be defined.
-// see boost_no_func_tmp_order.cxx for more details
+// see boost_no_func_tmp_order.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_func_tmp_order.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_func_tmp_order.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-#include "boost_no_func_tmp_order.cxx"
+#include "boost_no_func_tmp_order.ipp"
 #else
 namespace boost_no_function_template_ordering = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_function_template_ordering::test();
 }  
diff --git a/test/no_i64_limits_fail.cpp b/test/no_i64_limits_fail.cpp
index dde4900b..80b16a5c 100644
--- a/test/no_i64_limits_fail.cpp
+++ b/test/no_i64_limits_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_MS_INT64_NUMERIC_LIMITS
 // This file should not compile, if it does then
 // BOOST_NO_MS_INT64_NUMERIC_LIMITS need not be defined.
-// see boost_no_i64_limits.cxx for more details
+// see boost_no_i64_limits.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_i64_limits.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_i64_limits.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_MS_INT64_NUMERIC_LIMITS
-#include "boost_no_i64_limits.cxx"
+#include "boost_no_i64_limits.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_ms_int64_numeric_limits::test();
 }  
diff --git a/test/no_i64_limits_pass.cpp b/test/no_i64_limits_pass.cpp
index 3a4ada2e..be80f87b 100644
--- a/test/no_i64_limits_pass.cpp
+++ b/test/no_i64_limits_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_MS_INT64_NUMERIC_LIMITS
 // This file should compile, if it does not then
 // BOOST_NO_MS_INT64_NUMERIC_LIMITS needs to be defined.
-// see boost_no_i64_limits.cxx for more details
+// see boost_no_i64_limits.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_i64_limits.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_i64_limits.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_MS_INT64_NUMERIC_LIMITS
-#include "boost_no_i64_limits.cxx"
+#include "boost_no_i64_limits.ipp"
 #else
 namespace boost_no_ms_int64_numeric_limits = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_ms_int64_numeric_limits::test();
 }  
diff --git a/test/no_inline_memb_init_fail.cpp b/test/no_inline_memb_init_fail.cpp
index 61c2e9a3..fcf936aa 100644
--- a/test/no_inline_memb_init_fail.cpp
+++ b/test/no_inline_memb_init_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_INCLASS_MEMBER_INITIALIZATION
 // This file should not compile, if it does then
 // BOOST_NO_INCLASS_MEMBER_INITIALIZATION need not be defined.
-// see boost_no_inline_memb_init.cxx for more details
+// see boost_no_inline_memb_init.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_inline_memb_init.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_inline_memb_init.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-#include "boost_no_inline_memb_init.cxx"
+#include "boost_no_inline_memb_init.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_inclass_member_initialization::test();
 }  
diff --git a/test/no_inline_memb_init_pass.cpp b/test/no_inline_memb_init_pass.cpp
index d4670d8b..3de9ad14 100644
--- a/test/no_inline_memb_init_pass.cpp
+++ b/test/no_inline_memb_init_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_INCLASS_MEMBER_INITIALIZATION
 // This file should compile, if it does not then
 // BOOST_NO_INCLASS_MEMBER_INITIALIZATION needs to be defined.
-// see boost_no_inline_memb_init.cxx for more details
+// see boost_no_inline_memb_init.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_inline_memb_init.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_inline_memb_init.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-#include "boost_no_inline_memb_init.cxx"
+#include "boost_no_inline_memb_init.ipp"
 #else
 namespace boost_no_inclass_member_initialization = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_inclass_member_initialization::test();
 }  
diff --git a/test/no_integral_int64_t_fail.cpp b/test/no_integral_int64_t_fail.cpp
index 1c9b76d1..66040f3c 100644
--- a/test/no_integral_int64_t_fail.cpp
+++ b/test/no_integral_int64_t_fail.cpp
@@ -8,11 +8,11 @@
 // 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
+// see boost_no_integral_int64_t.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_integral_int64_t.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_integral_int64_t.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_INTEGRAL_INT64_T
-#include "boost_no_integral_int64_t.cxx"
+#include "boost_no_integral_int64_t.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int 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
index e2b37394..36fa1324 100644
--- a/test/no_integral_int64_t_pass.cpp
+++ b/test/no_integral_int64_t_pass.cpp
@@ -8,11 +8,11 @@
 // 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
+// see boost_no_integral_int64_t.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_integral_int64_t.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_integral_int64_t.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_INTEGRAL_INT64_T
-#include "boost_no_integral_int64_t.cxx"
+#include "boost_no_integral_int64_t.ipp"
 #else
 namespace boost_no_integral_int64_t = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_integral_int64_t::test();
 }  
diff --git a/test/no_iter_construct_fail.cpp b/test/no_iter_construct_fail.cpp
index 7ec712b8..fc78a5ef 100644
--- a/test/no_iter_construct_fail.cpp
+++ b/test/no_iter_construct_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS
 // This file should not compile, if it does then
 // BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS need not be defined.
-// see boost_no_iter_construct.cxx for more details
+// see boost_no_iter_construct.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_iter_construct.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_iter_construct.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS
-#include "boost_no_iter_construct.cxx"
+#include "boost_no_iter_construct.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_templated_iterator_constructors::test();
 }  
diff --git a/test/no_iter_construct_pass.cpp b/test/no_iter_construct_pass.cpp
index 507d140d..1fcdff1b 100644
--- a/test/no_iter_construct_pass.cpp
+++ b/test/no_iter_construct_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS
 // This file should compile, if it does not then
 // BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS needs to be defined.
-// see boost_no_iter_construct.cxx for more details
+// see boost_no_iter_construct.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_iter_construct.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_iter_construct.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS
-#include "boost_no_iter_construct.cxx"
+#include "boost_no_iter_construct.ipp"
 #else
 namespace boost_no_templated_iterator_constructors = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_templated_iterator_constructors::test();
 }  
diff --git a/test/no_limits_const_exp_fail.cpp b/test/no_limits_const_exp_fail.cpp
index ec48d038..4a956350 100644
--- a/test/no_limits_const_exp_fail.cpp
+++ b/test/no_limits_const_exp_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
 // This file should not compile, if it does then
 // BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS need not be defined.
-// see boost_no_limits_const_exp.cxx for more details
+// see boost_no_limits_const_exp.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_limits_const_exp.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_limits_const_exp.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
-#include "boost_no_limits_const_exp.cxx"
+#include "boost_no_limits_const_exp.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_limits_compile_time_constants::test();
 }  
diff --git a/test/no_limits_const_exp_pass.cpp b/test/no_limits_const_exp_pass.cpp
index 8cbe1b86..f391c7dc 100644
--- a/test/no_limits_const_exp_pass.cpp
+++ b/test/no_limits_const_exp_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
 // This file should compile, if it does not then
 // BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS needs to be defined.
-// see boost_no_limits_const_exp.cxx for more details
+// see boost_no_limits_const_exp.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_limits_const_exp.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_limits_const_exp.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
-#include "boost_no_limits_const_exp.cxx"
+#include "boost_no_limits_const_exp.ipp"
 #else
 namespace boost_no_limits_compile_time_constants = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_limits_compile_time_constants::test();
 }  
diff --git a/test/no_limits_fail.cpp b/test/no_limits_fail.cpp
index 9d4ccc1c..a884cdee 100644
--- a/test/no_limits_fail.cpp
+++ b/test/no_limits_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_LIMITS
 // This file should not compile, if it does then
 // BOOST_NO_LIMITS need not be defined.
-// see boost_no_limits.cxx for more details
+// see boost_no_limits.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_limits.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_limits.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_LIMITS
-#include "boost_no_limits.cxx"
+#include "boost_no_limits.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_limits::test();
 }  
diff --git a/test/no_limits_pass.cpp b/test/no_limits_pass.cpp
index 672f7817..4049456e 100644
--- a/test/no_limits_pass.cpp
+++ b/test/no_limits_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_LIMITS
 // This file should compile, if it does not then
 // BOOST_NO_LIMITS needs to be defined.
-// see boost_no_limits.cxx for more details
+// see boost_no_limits.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_limits.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_limits.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_LIMITS
-#include "boost_no_limits.cxx"
+#include "boost_no_limits.ipp"
 #else
 namespace boost_no_limits = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_limits::test();
 }  
diff --git a/test/no_ll_limits_fail.cpp b/test/no_ll_limits_fail.cpp
index 93bfbc4f..0c36ca7d 100644
--- a/test/no_ll_limits_fail.cpp
+++ b/test/no_ll_limits_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_LONG_LONG_NUMERIC_LIMITS
 // This file should not compile, if it does then
 // BOOST_NO_LONG_LONG_NUMERIC_LIMITS need not be defined.
-// see boost_no_ll_limits.cxx for more details
+// see boost_no_ll_limits.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_ll_limits.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_ll_limits.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_LONG_LONG_NUMERIC_LIMITS
-#include "boost_no_ll_limits.cxx"
+#include "boost_no_ll_limits.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_long_long_numeric_limits::test();
 }  
diff --git a/test/no_ll_limits_pass.cpp b/test/no_ll_limits_pass.cpp
index 24c1d26b..1396edf1 100644
--- a/test/no_ll_limits_pass.cpp
+++ b/test/no_ll_limits_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_LONG_LONG_NUMERIC_LIMITS
 // This file should compile, if it does not then
 // BOOST_NO_LONG_LONG_NUMERIC_LIMITS needs to be defined.
-// see boost_no_ll_limits.cxx for more details
+// see boost_no_ll_limits.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_ll_limits.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_ll_limits.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_LONG_LONG_NUMERIC_LIMITS
-#include "boost_no_ll_limits.cxx"
+#include "boost_no_ll_limits.ipp"
 #else
 namespace boost_no_long_long_numeric_limits = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_long_long_numeric_limits::test();
 }  
diff --git a/test/no_mem_func_spec_fail.cpp b/test/no_mem_func_spec_fail.cpp
index 44bebb2b..71a8001d 100644
--- a/test/no_mem_func_spec_fail.cpp
+++ b/test/no_mem_func_spec_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
 // This file should not compile, if it does then
 // BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS need not be defined.
-// see boost_no_mem_func_spec.cxx for more details
+// see boost_no_mem_func_spec.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_mem_func_spec.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_mem_func_spec.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
-#include "boost_no_mem_func_spec.cxx"
+#include "boost_no_mem_func_spec.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_member_function_specializations::test();
 }  
diff --git a/test/no_mem_func_spec_pass.cpp b/test/no_mem_func_spec_pass.cpp
index 6d5bacc7..d6e94a2f 100644
--- a/test/no_mem_func_spec_pass.cpp
+++ b/test/no_mem_func_spec_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
 // This file should compile, if it does not then
 // BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS needs to be defined.
-// see boost_no_mem_func_spec.cxx for more details
+// see boost_no_mem_func_spec.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_mem_func_spec.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_mem_func_spec.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
-#include "boost_no_mem_func_spec.cxx"
+#include "boost_no_mem_func_spec.ipp"
 #else
 namespace boost_no_member_function_specializations = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_member_function_specializations::test();
 }  
diff --git a/test/no_mem_tem_keyword_fail.cpp b/test/no_mem_tem_keyword_fail.cpp
index 076afa6e..cde67658 100644
--- a/test/no_mem_tem_keyword_fail.cpp
+++ b/test/no_mem_tem_keyword_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_MEMBER_TEMPLATE_KEYWORD
 // This file should not compile, if it does then
 // BOOST_NO_MEMBER_TEMPLATE_KEYWORD need not be defined.
-// see boost_no_mem_tem_keyword.cxx for more details
+// see boost_no_mem_tem_keyword.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_mem_tem_keyword.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_mem_tem_keyword.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_MEMBER_TEMPLATE_KEYWORD
-#include "boost_no_mem_tem_keyword.cxx"
+#include "boost_no_mem_tem_keyword.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_member_template_keyword::test();
 }  
diff --git a/test/no_mem_tem_keyword_pass.cpp b/test/no_mem_tem_keyword_pass.cpp
index 8e4cebbe..45617e01 100644
--- a/test/no_mem_tem_keyword_pass.cpp
+++ b/test/no_mem_tem_keyword_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_MEMBER_TEMPLATE_KEYWORD
 // This file should compile, if it does not then
 // BOOST_NO_MEMBER_TEMPLATE_KEYWORD needs to be defined.
-// see boost_no_mem_tem_keyword.cxx for more details
+// see boost_no_mem_tem_keyword.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_mem_tem_keyword.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_mem_tem_keyword.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_MEMBER_TEMPLATE_KEYWORD
-#include "boost_no_mem_tem_keyword.cxx"
+#include "boost_no_mem_tem_keyword.ipp"
 #else
 namespace boost_no_member_template_keyword = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_member_template_keyword::test();
 }  
diff --git a/test/no_mem_templ_frnds_fail.cpp b/test/no_mem_templ_frnds_fail.cpp
index 9c0d4b4d..536f2e89 100644
--- a/test/no_mem_templ_frnds_fail.cpp
+++ b/test/no_mem_templ_frnds_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 // This file should not compile, if it does then
 // BOOST_NO_MEMBER_TEMPLATE_FRIENDS need not be defined.
-// see boost_no_mem_templ_frnds.cxx for more details
+// see boost_no_mem_templ_frnds.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_mem_templ_frnds.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_mem_templ_frnds.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-#include "boost_no_mem_templ_frnds.cxx"
+#include "boost_no_mem_templ_frnds.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_member_template_friends::test();
 }  
diff --git a/test/no_mem_templ_frnds_pass.cpp b/test/no_mem_templ_frnds_pass.cpp
index 5e19a4d5..e7a98007 100644
--- a/test/no_mem_templ_frnds_pass.cpp
+++ b/test/no_mem_templ_frnds_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 // This file should compile, if it does not then
 // BOOST_NO_MEMBER_TEMPLATE_FRIENDS needs to be defined.
-// see boost_no_mem_templ_frnds.cxx for more details
+// see boost_no_mem_templ_frnds.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_mem_templ_frnds.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_mem_templ_frnds.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-#include "boost_no_mem_templ_frnds.cxx"
+#include "boost_no_mem_templ_frnds.ipp"
 #else
 namespace boost_no_member_template_friends = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_member_template_friends::test();
 }  
diff --git a/test/no_mem_templates_fail.cpp b/test/no_mem_templates_fail.cpp
index e825992d..ba9dde96 100644
--- a/test/no_mem_templates_fail.cpp
+++ b/test/no_mem_templates_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_MEMBER_TEMPLATES
 // This file should not compile, if it does then
 // BOOST_NO_MEMBER_TEMPLATES need not be defined.
-// see boost_no_mem_templates.cxx for more details
+// see boost_no_mem_templates.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_mem_templates.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_mem_templates.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_MEMBER_TEMPLATES
-#include "boost_no_mem_templates.cxx"
+#include "boost_no_mem_templates.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_member_templates::test();
 }  
diff --git a/test/no_mem_templates_pass.cpp b/test/no_mem_templates_pass.cpp
index abf8c697..b43d7cad 100644
--- a/test/no_mem_templates_pass.cpp
+++ b/test/no_mem_templates_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_MEMBER_TEMPLATES
 // This file should compile, if it does not then
 // BOOST_NO_MEMBER_TEMPLATES needs to be defined.
-// see boost_no_mem_templates.cxx for more details
+// see boost_no_mem_templates.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_mem_templates.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_mem_templates.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_MEMBER_TEMPLATES
-#include "boost_no_mem_templates.cxx"
+#include "boost_no_mem_templates.ipp"
 #else
 namespace boost_no_member_templates = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_member_templates::test();
 }  
diff --git a/test/no_ops_in_namespace_fail.cpp b/test/no_ops_in_namespace_fail.cpp
index 56aaed6b..14ba1540 100644
--- a/test/no_ops_in_namespace_fail.cpp
+++ b/test/no_ops_in_namespace_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_OPERATORS_IN_NAMESPACE
 // This file should not compile, if it does then
 // BOOST_NO_OPERATORS_IN_NAMESPACE need not be defined.
-// see boost_no_ops_in_namespace.cxx for more details
+// see boost_no_ops_in_namespace.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_ops_in_namespace.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_ops_in_namespace.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_OPERATORS_IN_NAMESPACE
-#include "boost_no_ops_in_namespace.cxx"
+#include "boost_no_ops_in_namespace.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_operators_in_namespace::test();
 }  
diff --git a/test/no_ops_in_namespace_pass.cpp b/test/no_ops_in_namespace_pass.cpp
index 9d61e861..0f163320 100644
--- a/test/no_ops_in_namespace_pass.cpp
+++ b/test/no_ops_in_namespace_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_OPERATORS_IN_NAMESPACE
 // This file should compile, if it does not then
 // BOOST_NO_OPERATORS_IN_NAMESPACE needs to be defined.
-// see boost_no_ops_in_namespace.cxx for more details
+// see boost_no_ops_in_namespace.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_ops_in_namespace.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_ops_in_namespace.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_OPERATORS_IN_NAMESPACE
-#include "boost_no_ops_in_namespace.cxx"
+#include "boost_no_ops_in_namespace.ipp"
 #else
 namespace boost_no_operators_in_namespace = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_operators_in_namespace::test();
 }  
diff --git a/test/no_partial_spec_fail.cpp b/test/no_partial_spec_fail.cpp
index 0bb4a9a9..f55d6e22 100644
--- a/test/no_partial_spec_fail.cpp
+++ b/test/no_partial_spec_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 // This file should not compile, if it does then
 // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION need not be defined.
-// see boost_no_partial_spec.cxx for more details
+// see boost_no_partial_spec.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_partial_spec.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_partial_spec.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#include "boost_no_partial_spec.cxx"
+#include "boost_no_partial_spec.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_template_partial_specialization::test();
 }  
diff --git a/test/no_partial_spec_pass.cpp b/test/no_partial_spec_pass.cpp
index 87948978..05388e69 100644
--- a/test/no_partial_spec_pass.cpp
+++ b/test/no_partial_spec_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 // This file should compile, if it does not then
 // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION needs to be defined.
-// see boost_no_partial_spec.cxx for more details
+// see boost_no_partial_spec.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_partial_spec.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_partial_spec.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#include "boost_no_partial_spec.cxx"
+#include "boost_no_partial_spec.ipp"
 #else
 namespace boost_no_template_partial_specialization = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_template_partial_specialization::test();
 }  
diff --git a/test/no_priv_aggregate_fail.cpp b/test/no_priv_aggregate_fail.cpp
index 429616fd..eaea8ced 100644
--- a/test/no_priv_aggregate_fail.cpp
+++ b/test/no_priv_aggregate_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_PRIVATE_IN_AGGREGATE
 // This file should not compile, if it does then
 // BOOST_NO_PRIVATE_IN_AGGREGATE need not be defined.
-// see boost_no_priv_aggregate.cxx for more details
+// see boost_no_priv_aggregate.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_priv_aggregate.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_priv_aggregate.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_PRIVATE_IN_AGGREGATE
-#include "boost_no_priv_aggregate.cxx"
+#include "boost_no_priv_aggregate.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_private_in_aggregate::test();
 }  
diff --git a/test/no_priv_aggregate_pass.cpp b/test/no_priv_aggregate_pass.cpp
index c8c6e1dd..e908cbff 100644
--- a/test/no_priv_aggregate_pass.cpp
+++ b/test/no_priv_aggregate_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_PRIVATE_IN_AGGREGATE
 // This file should compile, if it does not then
 // BOOST_NO_PRIVATE_IN_AGGREGATE needs to be defined.
-// see boost_no_priv_aggregate.cxx for more details
+// see boost_no_priv_aggregate.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_priv_aggregate.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_priv_aggregate.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_PRIVATE_IN_AGGREGATE
-#include "boost_no_priv_aggregate.cxx"
+#include "boost_no_priv_aggregate.ipp"
 #else
 namespace boost_no_private_in_aggregate = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_private_in_aggregate::test();
 }  
diff --git a/test/no_ptr_mem_const_fail.cpp b/test/no_ptr_mem_const_fail.cpp
index 13c4bb0d..05d10383 100644
--- a/test/no_ptr_mem_const_fail.cpp
+++ b/test/no_ptr_mem_const_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_POINTER_TO_MEMBER_CONST
 // This file should not compile, if it does then
 // BOOST_NO_POINTER_TO_MEMBER_CONST need not be defined.
-// see boost_no_ptr_mem_const.cxx for more details
+// see boost_no_ptr_mem_const.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_ptr_mem_const.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_ptr_mem_const.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_POINTER_TO_MEMBER_CONST
-#include "boost_no_ptr_mem_const.cxx"
+#include "boost_no_ptr_mem_const.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_pointer_to_member_const::test();
 }  
diff --git a/test/no_ptr_mem_const_pass.cpp b/test/no_ptr_mem_const_pass.cpp
index 59867dcc..0592d502 100644
--- a/test/no_ptr_mem_const_pass.cpp
+++ b/test/no_ptr_mem_const_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_POINTER_TO_MEMBER_CONST
 // This file should compile, if it does not then
 // BOOST_NO_POINTER_TO_MEMBER_CONST needs to be defined.
-// see boost_no_ptr_mem_const.cxx for more details
+// see boost_no_ptr_mem_const.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_ptr_mem_const.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_ptr_mem_const.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_POINTER_TO_MEMBER_CONST
-#include "boost_no_ptr_mem_const.cxx"
+#include "boost_no_ptr_mem_const.ipp"
 #else
 namespace boost_no_pointer_to_member_const = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_pointer_to_member_const::test();
 }  
diff --git a/test/no_ret_det_fail.cpp b/test/no_ret_det_fail.cpp
index c707b5e8..14a1f452 100644
--- a/test/no_ret_det_fail.cpp
+++ b/test/no_ret_det_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_UNREACHABLE_RETURN_DETECTION
 // This file should not compile, if it does then
 // BOOST_NO_UNREACHABLE_RETURN_DETECTION need not be defined.
-// see boost_no_ret_det.cxx for more details
+// see boost_no_ret_det.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_ret_det.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_ret_det.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_UNREACHABLE_RETURN_DETECTION
-#include "boost_no_ret_det.cxx"
+#include "boost_no_ret_det.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_unreachable_return_detection::test();
 }  
diff --git a/test/no_ret_det_pass.cpp b/test/no_ret_det_pass.cpp
index e43f0afb..1bb0e1fc 100644
--- a/test/no_ret_det_pass.cpp
+++ b/test/no_ret_det_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_UNREACHABLE_RETURN_DETECTION
 // This file should compile, if it does not then
 // BOOST_NO_UNREACHABLE_RETURN_DETECTION needs to be defined.
-// see boost_no_ret_det.cxx for more details
+// see boost_no_ret_det.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_ret_det.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_ret_det.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_UNREACHABLE_RETURN_DETECTION
-#include "boost_no_ret_det.cxx"
+#include "boost_no_ret_det.ipp"
 #else
 namespace boost_no_unreachable_return_detection = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_unreachable_return_detection::test();
 }  
diff --git a/test/no_sfinae_fail.cpp b/test/no_sfinae_fail.cpp
index 5b463b06..f2554b8c 100644
--- a/test/no_sfinae_fail.cpp
+++ b/test/no_sfinae_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_SFINAE
 // This file should not compile, if it does then
 // BOOST_NO_SFINAE need not be defined.
-// see boost_no_sfinae.cxx for more details
+// see boost_no_sfinae.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_sfinae.cxx on
-// Wed Dec 10 13:13:32 GMTST 2003
+// ../tools/generate from boost_no_sfinae.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_SFINAE
-#include "boost_no_sfinae.cxx"
+#include "boost_no_sfinae.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_sfinae::test();
 }  
diff --git a/test/no_sfinae_pass.cpp b/test/no_sfinae_pass.cpp
index b16ecb97..ddb53536 100644
--- a/test/no_sfinae_pass.cpp
+++ b/test/no_sfinae_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_SFINAE
 // This file should compile, if it does not then
 // BOOST_NO_SFINAE needs to be defined.
-// see boost_no_sfinae.cxx for more details
+// see boost_no_sfinae.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_sfinae.cxx on
-// Wed Dec 10 13:13:32 GMTST 2003
+// ../tools/generate from boost_no_sfinae.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_SFINAE
-#include "boost_no_sfinae.cxx"
+#include "boost_no_sfinae.ipp"
 #else
 namespace boost_no_sfinae = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_sfinae::test();
 }  
diff --git a/test/no_sstream_fail.cpp b/test/no_sstream_fail.cpp
index 9062cbea..d5c315e0 100644
--- a/test/no_sstream_fail.cpp
+++ b/test/no_sstream_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STRINGSTREAM
 // This file should not compile, if it does then
 // BOOST_NO_STRINGSTREAM need not be defined.
-// see boost_no_sstream.cxx for more details
+// see boost_no_sstream.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_sstream.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_sstream.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STRINGSTREAM
-#include "boost_no_sstream.cxx"
+#include "boost_no_sstream.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_stringstream::test();
 }  
diff --git a/test/no_sstream_pass.cpp b/test/no_sstream_pass.cpp
index 94f98b28..7f6d60d6 100644
--- a/test/no_sstream_pass.cpp
+++ b/test/no_sstream_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STRINGSTREAM
 // This file should compile, if it does not then
 // BOOST_NO_STRINGSTREAM needs to be defined.
-// see boost_no_sstream.cxx for more details
+// see boost_no_sstream.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_sstream.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_sstream.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STRINGSTREAM
-#include "boost_no_sstream.cxx"
+#include "boost_no_sstream.ipp"
 #else
 namespace boost_no_stringstream = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_stringstream::test();
 }  
diff --git a/test/no_std_allocator_fail.cpp b/test/no_std_allocator_fail.cpp
index f606988c..583f78e2 100644
--- a/test/no_std_allocator_fail.cpp
+++ b/test/no_std_allocator_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_ALLOCATOR
 // This file should not compile, if it does then
 // BOOST_NO_STD_ALLOCATOR need not be defined.
-// see boost_no_std_allocator.cxx for more details
+// see boost_no_std_allocator.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_allocator.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_allocator.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STD_ALLOCATOR
-#include "boost_no_std_allocator.cxx"
+#include "boost_no_std_allocator.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_allocator::test();
 }  
diff --git a/test/no_std_allocator_pass.cpp b/test/no_std_allocator_pass.cpp
index a4bc2faf..9de4623f 100644
--- a/test/no_std_allocator_pass.cpp
+++ b/test/no_std_allocator_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_ALLOCATOR
 // This file should compile, if it does not then
 // BOOST_NO_STD_ALLOCATOR needs to be defined.
-// see boost_no_std_allocator.cxx for more details
+// see boost_no_std_allocator.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_allocator.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_allocator.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STD_ALLOCATOR
-#include "boost_no_std_allocator.cxx"
+#include "boost_no_std_allocator.ipp"
 #else
 namespace boost_no_std_allocator = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_allocator::test();
 }  
diff --git a/test/no_std_distance_fail.cpp b/test/no_std_distance_fail.cpp
index 1f9bdd9d..91633541 100644
--- a/test/no_std_distance_fail.cpp
+++ b/test/no_std_distance_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_DISTANCE
 // This file should not compile, if it does then
 // BOOST_NO_STD_DISTANCE need not be defined.
-// see boost_no_std_distance.cxx for more details
+// see boost_no_std_distance.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_distance.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_distance.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STD_DISTANCE
-#include "boost_no_std_distance.cxx"
+#include "boost_no_std_distance.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_distance::test();
 }  
diff --git a/test/no_std_distance_pass.cpp b/test/no_std_distance_pass.cpp
index edf6edbd..1242f843 100644
--- a/test/no_std_distance_pass.cpp
+++ b/test/no_std_distance_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_DISTANCE
 // This file should compile, if it does not then
 // BOOST_NO_STD_DISTANCE needs to be defined.
-// see boost_no_std_distance.cxx for more details
+// see boost_no_std_distance.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_distance.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_distance.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STD_DISTANCE
-#include "boost_no_std_distance.cxx"
+#include "boost_no_std_distance.ipp"
 #else
 namespace boost_no_std_distance = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_distance::test();
 }  
diff --git a/test/no_std_iter_traits_fail.cpp b/test/no_std_iter_traits_fail.cpp
index 803b978e..60f80161 100644
--- a/test/no_std_iter_traits_fail.cpp
+++ b/test/no_std_iter_traits_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_ITERATOR_TRAITS
 // This file should not compile, if it does then
 // BOOST_NO_STD_ITERATOR_TRAITS need not be defined.
-// see boost_no_std_iter_traits.cxx for more details
+// see boost_no_std_iter_traits.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_iter_traits.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_iter_traits.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STD_ITERATOR_TRAITS
-#include "boost_no_std_iter_traits.cxx"
+#include "boost_no_std_iter_traits.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_iterator_traits::test();
 }  
diff --git a/test/no_std_iter_traits_pass.cpp b/test/no_std_iter_traits_pass.cpp
index ff44817b..1e2aaaa7 100644
--- a/test/no_std_iter_traits_pass.cpp
+++ b/test/no_std_iter_traits_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_ITERATOR_TRAITS
 // This file should compile, if it does not then
 // BOOST_NO_STD_ITERATOR_TRAITS needs to be defined.
-// see boost_no_std_iter_traits.cxx for more details
+// see boost_no_std_iter_traits.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_iter_traits.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_iter_traits.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STD_ITERATOR_TRAITS
-#include "boost_no_std_iter_traits.cxx"
+#include "boost_no_std_iter_traits.ipp"
 #else
 namespace boost_no_std_iterator_traits = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_iterator_traits::test();
 }  
diff --git a/test/no_std_iterator_fail.cpp b/test/no_std_iterator_fail.cpp
index 7aaf7aa3..8953cc4b 100644
--- a/test/no_std_iterator_fail.cpp
+++ b/test/no_std_iterator_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_ITERATOR
 // This file should not compile, if it does then
 // BOOST_NO_STD_ITERATOR need not be defined.
-// see boost_no_std_iterator.cxx for more details
+// see boost_no_std_iterator.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_iterator.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_iterator.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STD_ITERATOR
-#include "boost_no_std_iterator.cxx"
+#include "boost_no_std_iterator.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_iterator::test();
 }  
diff --git a/test/no_std_iterator_pass.cpp b/test/no_std_iterator_pass.cpp
index 22a981fd..32997927 100644
--- a/test/no_std_iterator_pass.cpp
+++ b/test/no_std_iterator_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_ITERATOR
 // This file should compile, if it does not then
 // BOOST_NO_STD_ITERATOR needs to be defined.
-// see boost_no_std_iterator.cxx for more details
+// see boost_no_std_iterator.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_iterator.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_iterator.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STD_ITERATOR
-#include "boost_no_std_iterator.cxx"
+#include "boost_no_std_iterator.ipp"
 #else
 namespace boost_no_std_iterator = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_iterator::test();
 }  
diff --git a/test/no_std_locale_fail.cpp b/test/no_std_locale_fail.cpp
index 3f69686e..aa9d6a81 100644
--- a/test/no_std_locale_fail.cpp
+++ b/test/no_std_locale_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_LOCALE
 // This file should not compile, if it does then
 // BOOST_NO_STD_LOCALE need not be defined.
-// see boost_no_std_locale.cxx for more details
+// see boost_no_std_locale.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_locale.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_locale.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STD_LOCALE
-#include "boost_no_std_locale.cxx"
+#include "boost_no_std_locale.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_locale::test();
 }  
diff --git a/test/no_std_locale_pass.cpp b/test/no_std_locale_pass.cpp
index d11f237c..efee930d 100644
--- a/test/no_std_locale_pass.cpp
+++ b/test/no_std_locale_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_LOCALE
 // This file should compile, if it does not then
 // BOOST_NO_STD_LOCALE needs to be defined.
-// see boost_no_std_locale.cxx for more details
+// see boost_no_std_locale.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_locale.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_locale.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STD_LOCALE
-#include "boost_no_std_locale.cxx"
+#include "boost_no_std_locale.ipp"
 #else
 namespace boost_no_std_locale = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_locale::test();
 }  
diff --git a/test/no_std_messages_fail.cpp b/test/no_std_messages_fail.cpp
index e23c39cd..2635e0e8 100644
--- a/test/no_std_messages_fail.cpp
+++ b/test/no_std_messages_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_MESSAGES
 // This file should not compile, if it does then
 // BOOST_NO_STD_MESSAGES need not be defined.
-// see boost_no_std_messages.cxx for more details
+// see boost_no_std_messages.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_messages.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_messages.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STD_MESSAGES
-#include "boost_no_std_messages.cxx"
+#include "boost_no_std_messages.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_messages::test();
 }  
diff --git a/test/no_std_messages_pass.cpp b/test/no_std_messages_pass.cpp
index 911c995a..9cd08bc5 100644
--- a/test/no_std_messages_pass.cpp
+++ b/test/no_std_messages_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_MESSAGES
 // This file should compile, if it does not then
 // BOOST_NO_STD_MESSAGES needs to be defined.
-// see boost_no_std_messages.cxx for more details
+// see boost_no_std_messages.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_messages.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_messages.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STD_MESSAGES
-#include "boost_no_std_messages.cxx"
+#include "boost_no_std_messages.ipp"
 #else
 namespace boost_no_std_messages = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_messages::test();
 }  
diff --git a/test/no_std_min_max_fail.cpp b/test/no_std_min_max_fail.cpp
index 6ad4e208..f9659cb1 100644
--- a/test/no_std_min_max_fail.cpp
+++ b/test/no_std_min_max_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_MIN_MAX
 // This file should not compile, if it does then
 // BOOST_NO_STD_MIN_MAX need not be defined.
-// see boost_no_std_min_max.cxx for more details
+// see boost_no_std_min_max.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_min_max.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_min_max.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STD_MIN_MAX
-#include "boost_no_std_min_max.cxx"
+#include "boost_no_std_min_max.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_min_max::test();
 }  
diff --git a/test/no_std_min_max_pass.cpp b/test/no_std_min_max_pass.cpp
index 95749db1..f96fb2f4 100644
--- a/test/no_std_min_max_pass.cpp
+++ b/test/no_std_min_max_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_MIN_MAX
 // This file should compile, if it does not then
 // BOOST_NO_STD_MIN_MAX needs to be defined.
-// see boost_no_std_min_max.cxx for more details
+// see boost_no_std_min_max.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_min_max.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_min_max.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STD_MIN_MAX
-#include "boost_no_std_min_max.cxx"
+#include "boost_no_std_min_max.ipp"
 #else
 namespace boost_no_std_min_max = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_min_max::test();
 }  
diff --git a/test/no_std_oi_assign_fail.cpp b/test/no_std_oi_assign_fail.cpp
index b1efba8e..07b69615 100644
--- a/test/no_std_oi_assign_fail.cpp
+++ b/test/no_std_oi_assign_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN
 // This file should not compile, if it does then
 // BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN need not be defined.
-// see boost_no_std_oi_assign.cxx for more details
+// see boost_no_std_oi_assign.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_oi_assign.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_oi_assign.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN
-#include "boost_no_std_oi_assign.cxx"
+#include "boost_no_std_oi_assign.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_output_iterator_assign::test();
 }  
diff --git a/test/no_std_oi_assign_pass.cpp b/test/no_std_oi_assign_pass.cpp
index f4ce5cf0..72f937be 100644
--- a/test/no_std_oi_assign_pass.cpp
+++ b/test/no_std_oi_assign_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN
 // This file should compile, if it does not then
 // BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN needs to be defined.
-// see boost_no_std_oi_assign.cxx for more details
+// see boost_no_std_oi_assign.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_oi_assign.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_oi_assign.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN
-#include "boost_no_std_oi_assign.cxx"
+#include "boost_no_std_oi_assign.ipp"
 #else
 namespace boost_no_std_output_iterator_assign = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_output_iterator_assign::test();
 }  
diff --git a/test/no_std_use_facet_fail.cpp b/test/no_std_use_facet_fail.cpp
index 76ecdd4c..d0a1904e 100644
--- a/test/no_std_use_facet_fail.cpp
+++ b/test/no_std_use_facet_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_USE_FACET
 // This file should not compile, if it does then
 // BOOST_NO_STD_USE_FACET need not be defined.
-// see boost_no_std_use_facet.cxx for more details
+// see boost_no_std_use_facet.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_use_facet.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_use_facet.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STD_USE_FACET
-#include "boost_no_std_use_facet.cxx"
+#include "boost_no_std_use_facet.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_use_facet::test();
 }  
diff --git a/test/no_std_use_facet_pass.cpp b/test/no_std_use_facet_pass.cpp
index 7e1f9ec8..311dd85b 100644
--- a/test/no_std_use_facet_pass.cpp
+++ b/test/no_std_use_facet_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_USE_FACET
 // This file should compile, if it does not then
 // BOOST_NO_STD_USE_FACET needs to be defined.
-// see boost_no_std_use_facet.cxx for more details
+// see boost_no_std_use_facet.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_use_facet.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_use_facet.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STD_USE_FACET
-#include "boost_no_std_use_facet.cxx"
+#include "boost_no_std_use_facet.ipp"
 #else
 namespace boost_no_std_use_facet = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_use_facet::test();
 }  
diff --git a/test/no_std_wstreambuf_fail.cpp b/test/no_std_wstreambuf_fail.cpp
index 98c98564..6ddc757c 100644
--- a/test/no_std_wstreambuf_fail.cpp
+++ b/test/no_std_wstreambuf_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_WSTREAMBUF
 // This file should not compile, if it does then
 // BOOST_NO_STD_WSTREAMBUF need not be defined.
-// see boost_no_std_wstreambuf.cxx for more details
+// see boost_no_std_wstreambuf.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_wstreambuf.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_wstreambuf.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STD_WSTREAMBUF
-#include "boost_no_std_wstreambuf.cxx"
+#include "boost_no_std_wstreambuf.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_wstreambuf::test();
 }  
diff --git a/test/no_std_wstreambuf_pass.cpp b/test/no_std_wstreambuf_pass.cpp
index d21d8726..017f3cea 100644
--- a/test/no_std_wstreambuf_pass.cpp
+++ b/test/no_std_wstreambuf_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_WSTREAMBUF
 // This file should compile, if it does not then
 // BOOST_NO_STD_WSTREAMBUF needs to be defined.
-// see boost_no_std_wstreambuf.cxx for more details
+// see boost_no_std_wstreambuf.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_wstreambuf.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_wstreambuf.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STD_WSTREAMBUF
-#include "boost_no_std_wstreambuf.cxx"
+#include "boost_no_std_wstreambuf.ipp"
 #else
 namespace boost_no_std_wstreambuf = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_wstreambuf::test();
 }  
diff --git a/test/no_std_wstring_fail.cpp b/test/no_std_wstring_fail.cpp
index 0262f701..abb0ad0e 100644
--- a/test/no_std_wstring_fail.cpp
+++ b/test/no_std_wstring_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_WSTRING
 // This file should not compile, if it does then
 // BOOST_NO_STD_WSTRING need not be defined.
-// see boost_no_std_wstring.cxx for more details
+// see boost_no_std_wstring.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_wstring.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_wstring.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STD_WSTRING
-#include "boost_no_std_wstring.cxx"
+#include "boost_no_std_wstring.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_wstring::test();
 }  
diff --git a/test/no_std_wstring_pass.cpp b/test/no_std_wstring_pass.cpp
index 467160ea..2eb76019 100644
--- a/test/no_std_wstring_pass.cpp
+++ b/test/no_std_wstring_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STD_WSTRING
 // This file should compile, if it does not then
 // BOOST_NO_STD_WSTRING needs to be defined.
-// see boost_no_std_wstring.cxx for more details
+// see boost_no_std_wstring.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_std_wstring.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_std_wstring.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STD_WSTRING
-#include "boost_no_std_wstring.cxx"
+#include "boost_no_std_wstring.ipp"
 #else
 namespace boost_no_std_wstring = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_std_wstring::test();
 }  
diff --git a/test/no_stdc_namespace_fail.cpp b/test/no_stdc_namespace_fail.cpp
index 476c4672..800a448a 100644
--- a/test/no_stdc_namespace_fail.cpp
+++ b/test/no_stdc_namespace_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STDC_NAMESPACE
 // This file should not compile, if it does then
 // BOOST_NO_STDC_NAMESPACE need not be defined.
-// see boost_no_stdc_namespace.cxx for more details
+// see boost_no_stdc_namespace.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_stdc_namespace.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_stdc_namespace.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_STDC_NAMESPACE
-#include "boost_no_stdc_namespace.cxx"
+#include "boost_no_stdc_namespace.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_stdc_namespace::test();
 }  
diff --git a/test/no_stdc_namespace_pass.cpp b/test/no_stdc_namespace_pass.cpp
index c0331408..f9e11251 100644
--- a/test/no_stdc_namespace_pass.cpp
+++ b/test/no_stdc_namespace_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_STDC_NAMESPACE
 // This file should compile, if it does not then
 // BOOST_NO_STDC_NAMESPACE needs to be defined.
-// see boost_no_stdc_namespace.cxx for more details
+// see boost_no_stdc_namespace.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_stdc_namespace.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_stdc_namespace.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_STDC_NAMESPACE
-#include "boost_no_stdc_namespace.cxx"
+#include "boost_no_stdc_namespace.ipp"
 #else
 namespace boost_no_stdc_namespace = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_stdc_namespace::test();
 }  
diff --git a/test/no_swprintf_fail.cpp b/test/no_swprintf_fail.cpp
index dc4c4cba..86acc572 100644
--- a/test/no_swprintf_fail.cpp
+++ b/test/no_swprintf_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_SWPRINTF
 // This file should not compile, if it does then
 // BOOST_NO_SWPRINTF need not be defined.
-// see boost_no_swprintf.cxx for more details
+// see boost_no_swprintf.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_swprintf.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_swprintf.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_SWPRINTF
-#include "boost_no_swprintf.cxx"
+#include "boost_no_swprintf.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_swprintf::test();
 }  
diff --git a/test/no_swprintf_pass.cpp b/test/no_swprintf_pass.cpp
index b8ad29b6..0ea27d5c 100644
--- a/test/no_swprintf_pass.cpp
+++ b/test/no_swprintf_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_SWPRINTF
 // This file should compile, if it does not then
 // BOOST_NO_SWPRINTF needs to be defined.
-// see boost_no_swprintf.cxx for more details
+// see boost_no_swprintf.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_swprintf.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_swprintf.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_SWPRINTF
-#include "boost_no_swprintf.cxx"
+#include "boost_no_swprintf.ipp"
 #else
 namespace boost_no_swprintf = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_swprintf::test();
 }  
diff --git a/test/no_template_template_fail.cpp b/test/no_template_template_fail.cpp
index b3d85ed0..7bf1d648 100644
--- a/test/no_template_template_fail.cpp
+++ b/test/no_template_template_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_TEMPLATE_TEMPLATES
 // This file should not compile, if it does then
 // BOOST_NO_TEMPLATE_TEMPLATES need not be defined.
-// see boost_no_template_template.cxx for more details
+// see boost_no_template_template.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_template_template.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_template_template.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_TEMPLATE_TEMPLATES
-#include "boost_no_template_template.cxx"
+#include "boost_no_template_template.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_template_templates::test();
 }  
diff --git a/test/no_template_template_pass.cpp b/test/no_template_template_pass.cpp
index 9bedbe2d..0aefeddd 100644
--- a/test/no_template_template_pass.cpp
+++ b/test/no_template_template_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_TEMPLATE_TEMPLATES
 // This file should compile, if it does not then
 // BOOST_NO_TEMPLATE_TEMPLATES needs to be defined.
-// see boost_no_template_template.cxx for more details
+// see boost_no_template_template.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_template_template.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_template_template.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_TEMPLATE_TEMPLATES
-#include "boost_no_template_template.cxx"
+#include "boost_no_template_template.ipp"
 #else
 namespace boost_no_template_templates = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_template_templates::test();
 }  
diff --git a/test/no_using_breaks_adl_fail.cpp b/test/no_using_breaks_adl_fail.cpp
index 25d28ec3..2c27f982 100644
--- a/test/no_using_breaks_adl_fail.cpp
+++ b/test/no_using_breaks_adl_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
 // This file should not compile, if it does then
 // BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL need not be defined.
-// see boost_no_using_breaks_adl.cxx for more details
+// see boost_no_using_breaks_adl.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_using_breaks_adl.cxx on
-// Wed Dec 10 13:13:32 GMTST 2003
+// ../tools/generate from boost_no_using_breaks_adl.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
-#include "boost_no_using_breaks_adl.cxx"
+#include "boost_no_using_breaks_adl.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_function_scope_using_declaration_breaks_adl::test();
 }  
diff --git a/test/no_using_breaks_adl_pass.cpp b/test/no_using_breaks_adl_pass.cpp
index a6c28905..03489b67 100644
--- a/test/no_using_breaks_adl_pass.cpp
+++ b/test/no_using_breaks_adl_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
 // This file should compile, if it does not then
 // BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL needs to be defined.
-// see boost_no_using_breaks_adl.cxx for more details
+// see boost_no_using_breaks_adl.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_using_breaks_adl.cxx on
-// Wed Dec 10 13:13:32 GMTST 2003
+// ../tools/generate from boost_no_using_breaks_adl.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
-#include "boost_no_using_breaks_adl.cxx"
+#include "boost_no_using_breaks_adl.ipp"
 #else
 namespace boost_function_scope_using_declaration_breaks_adl = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_function_scope_using_declaration_breaks_adl::test();
 }  
diff --git a/test/no_using_decl_overld_fail.cpp b/test/no_using_decl_overld_fail.cpp
index d5fa1ce4..57ada107 100644
--- a/test/no_using_decl_overld_fail.cpp
+++ b/test/no_using_decl_overld_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
 // This file should not compile, if it does then
 // BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE need not be defined.
-// see boost_no_using_decl_overld.cxx for more details
+// see boost_no_using_decl_overld.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_using_decl_overld.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_using_decl_overld.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
-#include "boost_no_using_decl_overld.cxx"
+#include "boost_no_using_decl_overld.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_using_declaration_overloads_from_typename_base::test();
 }  
diff --git a/test/no_using_decl_overld_pass.cpp b/test/no_using_decl_overld_pass.cpp
index 741ece5d..0ed1d6e3 100644
--- a/test/no_using_decl_overld_pass.cpp
+++ b/test/no_using_decl_overld_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
 // This file should compile, if it does not then
 // BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE needs to be defined.
-// see boost_no_using_decl_overld.cxx for more details
+// see boost_no_using_decl_overld.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_using_decl_overld.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_using_decl_overld.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
-#include "boost_no_using_decl_overld.cxx"
+#include "boost_no_using_decl_overld.ipp"
 #else
 namespace boost_no_using_declaration_overloads_from_typename_base = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_using_declaration_overloads_from_typename_base::test();
 }  
diff --git a/test/no_using_template_fail.cpp b/test/no_using_template_fail.cpp
index 028ed0a9..fb963bb5 100644
--- a/test/no_using_template_fail.cpp
+++ b/test/no_using_template_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_USING_TEMPLATE
 // This file should not compile, if it does then
 // BOOST_NO_USING_TEMPLATE need not be defined.
-// see boost_no_using_template.cxx for more details
+// see boost_no_using_template.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_using_template.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_using_template.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_USING_TEMPLATE
-#include "boost_no_using_template.cxx"
+#include "boost_no_using_template.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_using_template::test();
 }  
diff --git a/test/no_using_template_pass.cpp b/test/no_using_template_pass.cpp
index ae9d82cf..fc35f569 100644
--- a/test/no_using_template_pass.cpp
+++ b/test/no_using_template_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_USING_TEMPLATE
 // This file should compile, if it does not then
 // BOOST_NO_USING_TEMPLATE needs to be defined.
-// see boost_no_using_template.cxx for more details
+// see boost_no_using_template.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_using_template.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_using_template.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_USING_TEMPLATE
-#include "boost_no_using_template.cxx"
+#include "boost_no_using_template.ipp"
 #else
 namespace boost_no_using_template = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_using_template::test();
 }  
diff --git a/test/no_void_returns_fail.cpp b/test/no_void_returns_fail.cpp
index e51d9ce3..4e42791d 100644
--- a/test/no_void_returns_fail.cpp
+++ b/test/no_void_returns_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_VOID_RETURNS
 // This file should not compile, if it does then
 // BOOST_NO_VOID_RETURNS need not be defined.
-// see boost_no_void_returns.cxx for more details
+// see boost_no_void_returns.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_void_returns.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_void_returns.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_VOID_RETURNS
-#include "boost_no_void_returns.cxx"
+#include "boost_no_void_returns.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_void_returns::test();
 }  
diff --git a/test/no_void_returns_pass.cpp b/test/no_void_returns_pass.cpp
index d4a183e0..f75b59e5 100644
--- a/test/no_void_returns_pass.cpp
+++ b/test/no_void_returns_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_VOID_RETURNS
 // This file should compile, if it does not then
 // BOOST_NO_VOID_RETURNS needs to be defined.
-// see boost_no_void_returns.cxx for more details
+// see boost_no_void_returns.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_void_returns.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_void_returns.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_VOID_RETURNS
-#include "boost_no_void_returns.cxx"
+#include "boost_no_void_returns.ipp"
 #else
 namespace boost_no_void_returns = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_void_returns::test();
 }  
diff --git a/test/no_wchar_t_fail.cpp b/test/no_wchar_t_fail.cpp
index 8561be09..14388714 100644
--- a/test/no_wchar_t_fail.cpp
+++ b/test/no_wchar_t_fail.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_INTRINSIC_WCHAR_T
 // This file should not compile, if it does then
 // BOOST_NO_INTRINSIC_WCHAR_T need not be defined.
-// see boost_no_wchar_t.cxx for more details
+// see boost_no_wchar_t.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_wchar_t.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_wchar_t.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifdef BOOST_NO_INTRINSIC_WCHAR_T
-#include "boost_no_wchar_t.cxx"
+#include "boost_no_wchar_t.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_intrinsic_wchar_t::test();
 }  
diff --git a/test/no_wchar_t_pass.cpp b/test/no_wchar_t_pass.cpp
index c0b73bf0..b4f16f24 100644
--- a/test/no_wchar_t_pass.cpp
+++ b/test/no_wchar_t_pass.cpp
@@ -8,11 +8,11 @@
 // Test file for macro BOOST_NO_INTRINSIC_WCHAR_T
 // This file should compile, if it does not then
 // BOOST_NO_INTRINSIC_WCHAR_T needs to be defined.
-// see boost_no_wchar_t.cxx for more details
+// see boost_no_wchar_t.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_no_wchar_t.cxx on
-// Tue Oct  7 11:26:18 GMTST 2003
+// ../tools/generate from boost_no_wchar_t.ipp on
+// Tue Jun 15 11:47:07 GMTST 2004
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,12 +24,12 @@
 #include "test.hpp"
 
 #ifndef BOOST_NO_INTRINSIC_WCHAR_T
-#include "boost_no_wchar_t.cxx"
+#include "boost_no_wchar_t.ipp"
 #else
 namespace boost_no_intrinsic_wchar_t = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return boost_no_intrinsic_wchar_t::test();
 }  
diff --git a/test/options.jam b/test/options.jam
index fc00be5f..df16e7ea 100644
--- a/test/options.jam
+++ b/test/options.jam
@@ -16,7 +16,7 @@ template config_options
 
 template config_test_options
    : # sources
-     <lib>../../test/build/boost_prg_exec_monitor 
+     <lib>../../test/build/boost_test_exec_monitor 
      <template>config_options
    ;
  
diff --git a/tools/configure.in b/tools/configure.in
index 753aaaa8..e3e10efc 100644
--- a/tools/configure.in
+++ b/tools/configure.in
@@ -144,9 +144,9 @@ AC_CHECK_LIB(rt, clock)
 #
 # enumerate test files and test each one:
 #
-for file in $boost_base/libs/config/test/boost_no*.cxx; do
+for file in $boost_base/libs/config/test/boost_no*.ipp; do
 
-   basename=`echo $file | sed 's/.*boost_\(.*\)\.cxx/\1/'`
+   basename=`echo $file | sed 's/.*boost_\(.*\)\.ipp/\1/'`
    macroname=`cat $file | grep '^//[[]    []]*MACRO:' | sed 's/.*MACRO:[[]    []]*\([[]_A-Z0-9[]]*\).*/\1/'`
    title=`cat $file | grep '^//[[]  []]*TITLE:' | sed 's/.*TITLE:[[]    []]*\([[]^  []].*\)/\1/'`
    namespace=`echo $macroname | tr [[:upper:]] [[:lower:]]`
@@ -169,7 +169,7 @@ for file in $boost_base/libs/config/test/boost_no*.cxx; do
 #include "test.hpp"
 
 #ifndef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 namespace ${namespace} = empty_boost;
 #endif
@@ -192,7 +192,7 @@ int main(){ return ${namespace}::test(); } ]
 #include "test.hpp"
 
 #ifdef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 #error "this file should not compile"
 #endif
@@ -212,9 +212,9 @@ done
 #
 # enumerate optional test files and test each one:
 #
-for file in $boost_base/libs/config/test/boost_has*.cxx; do
+for file in $boost_base/libs/config/test/boost_has*.ipp; do
 
-   basename=`echo $file | sed 's/.*boost_\(.*\)\.cxx/\1/'`
+   basename=`echo $file | sed 's/.*boost_\(.*\)\.ipp/\1/'`
    macroname=`cat $file | grep '^//[[]    []]*MACRO:' | sed 's/.*MACRO:[[]    []]*\([[]_A-Z0-9[]]*\).*/\1/'`
    title=`cat $file | grep '^//[[]  []]*TITLE:' | sed 's/.*TITLE:[[]    []]*\([[]^  []].*\)/\1/'`
    namespace=`echo $macroname | tr [[:upper:]] [[:lower:]]`
@@ -233,7 +233,7 @@ for file in $boost_base/libs/config/test/boost_has*.cxx; do
 #include "test.hpp"
 
 #ifdef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 namespace ${namespace} = empty_boost;
 #endif
@@ -253,7 +253,7 @@ int main(){ return ${namespace}::test(); }]
 #include "test.hpp"
 
 #ifndef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 #error "this file should not compile"
 #endif
@@ -279,7 +279,7 @@ int main(){ return ${namespace}::test(); }]
 #include <boost/config.hpp>
 #include "test.hpp"
 
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 
 int main(){ return ${namespace}::test(); }]
    ,
@@ -437,5 +437,6 @@ fi
 
 
 
+
 
 
diff --git a/tools/generate b/tools/generate
index 761e5230..6d103038 100644
--- a/tools/generate
+++ b/tools/generate
@@ -36,7 +36,7 @@ subproject libs/config/test ;
 import testing ./options ;
 
 run config_info.cpp <template>config_options ;
-run config_test.cpp <lib>../../test/build/boost_test_exec_monitor <template>config_options ;
+run config_test.cpp <template>config_options ;
 run limits_test.cpp <template>config_test_options ;
 run abi/abi_test.cpp abi/main.cpp <template>config_options ;
 
@@ -53,17 +53,18 @@ cat > ../test/config_test.cpp << EOF
 // Test file for config setup
 // This file should compile, if it does not then
 // one or more macros need to be defined.
-// see boost_*.cxx for more details
+// see boost_*.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_*.cxx on
+// ../tools/generate from boost_*.ipp on
 // $date_string
 
 #include <boost/config.hpp>
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#include <iostream>
 #include "test.hpp"
 
+int error_count = 0;
+
 EOF
 
 all_no=""
@@ -72,18 +73,19 @@ all_has=""
 #
 # enumerate through the boost_no* test files:
 #
-for file in ../test/boost_no_*.cxx; do
+for file in ../test/boost_no_*.ipp; do
 
-   basename=`echo $file | sed 's/.*boost_\(.*\)\.cxx/\1/'`
+   basename=`echo $file | sed 's/.*boost_\(.*\)\.ipp/\1/'`
    macroname=`cat $file | grep '^//[   ]*MACRO:' | sed 's/.*MACRO:[  ]*\([_A-Z0-9]*\).*/\1/'`
    title=`cat $file | grep '^//[    ]*TITLE:' | sed 's/.*TITLE:[  ]*\([^   ].*\)/\1/'`
    namespace=`echo $macroname | tr [:upper:] [:lower:]`
    
-#  echo $basename
+   echo "Processing $file..."
    echo
-   echo "processing $macroname ..."
-#  echo $title
-#  echo $namespace
+   echo "Basename:  $basename"
+   echo "Macro:     $macroname"
+   echo "Title:     $title"
+   echo "Namespace: $namespace"
    # now create positive test file:
    if test -f "../test/$basename""_pass.cpp"; then
       echo "skipping file ../test/$basename""_pass.cpp"
@@ -100,10 +102,10 @@ for file in ../test/boost_no_*.cxx; do
 // Test file for macro $macroname
 // This file should compile, if it does not then
 // $macroname needs to be defined.
-// see boost_$basename.cxx for more details
+// see boost_$basename.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_$basename.cxx on
+// ../tools/generate from boost_$basename.ipp on
 // $date_string
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -116,12 +118,12 @@ for file in ../test/boost_no_*.cxx; do
 #include "test.hpp"
 
 #ifndef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 namespace ${namespace} = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return ${namespace}::test();
 }  
@@ -146,10 +148,10 @@ EOF
 // Test file for macro $macroname
 // This file should not compile, if it does then
 // $macroname need not be defined.
-// see boost_$basename.cxx for more details
+// see boost_$basename.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_$basename.cxx on
+// ../tools/generate from boost_$basename.ipp on
 // $date_string
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -162,12 +164,12 @@ EOF
 #include "test.hpp"
 
 #ifdef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return ${namespace}::test();
 }  
@@ -178,7 +180,7 @@ EOF
    # now append to config_test.cpp:
    cat >> "../test/config_test.cpp" << EOF
 #ifndef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 namespace ${namespace} = empty_boost;
 #endif
@@ -198,9 +200,9 @@ done
 #
 # enumerate through the boost_has* test files:
 #
-for file in ../test/boost_has_*.cxx; do
+for file in ../test/boost_has_*.ipp; do
 
-   basename=`echo $file | sed 's/.*boost_\(.*\)\.cxx/\1/'`
+   basename=`echo $file | sed 's/.*boost_\(.*\)\.ipp/\1/'`
    macroname=`cat $file | grep '^//[   ]*MACRO:' | sed 's/.*MACRO:[  ]*\([_A-Z0-9]*\).*/\1/'`
    title=`cat $file | grep '^//[    ]*TITLE:' | sed 's/.*TITLE:[  ]*\([^   ].*\)/\1/'`
    namespace=`echo $macroname | tr [:upper:] [:lower:]`
@@ -227,10 +229,10 @@ for file in ../test/boost_has_*.cxx; do
 // Test file for macro $macroname
 // This file should compile, if it does not then
 // $macroname should not be defined.
-// see boost_$basename.cxx for more details
+// see boost_$basename.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_$basename.cxx on
+// ../tools/generate from boost_$basename.ipp on
 // $date_string
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -243,12 +245,12 @@ for file in ../test/boost_has_*.cxx; do
 #include "test.hpp"
 
 #ifdef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 namespace ${namespace} = empty_boost;
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return ${namespace}::test();
 }  
@@ -272,10 +274,10 @@ EOF
 // Test file for macro $macroname
 // This file should not compile, if it does then
 // $macroname may be defined.
-// see boost_$basename.cxx for more details
+// see boost_$basename.ipp for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_$basename.cxx on
+// ../tools/generate from boost_$basename.ipp on
 // $date_string
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -288,12 +290,12 @@ EOF
 #include "test.hpp"
 
 #ifndef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 #error "this file should not compile"
 #endif
 
-int cpp_main( int, char *[] )
+int main( int, char *[] )
 {
    return ${namespace}::test();
 }  
@@ -304,7 +306,7 @@ EOF
    # now append to config_test.cpp:
    cat >> "../test/config_test.cpp" << EOF
 #ifdef $macroname
-#include "boost_$basename.cxx"
+#include "boost_$basename.ipp"
 #else
 namespace ${namespace} = empty_boost;
 #endif
@@ -328,24 +330,32 @@ done
    echo generating "../test/config_test.cpp"
    cat >> "../test/config_test.cpp" << EOF
 
-int test_main( int, char *[] )
+int main( int, char *[] )
 {
 EOF
 
 for macro in $all_no; do
    cat >> "../test/config_test.cpp" << EOF
-   BOOST_TEST(0 == ${macro}::test());
+   if(0 != ${macro}::test())
+   {
+      std::cerr << "Failed test for $macroname at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
 EOF
 
 done
 for macro in $all_has; do
    cat >> "../test/config_test.cpp" << EOF
-   BOOST_TEST(0 == ${macro}::test());
+   if(0 != ${macro}::test())
+   {
+      std::cerr << "Failed test for $macroname at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
 EOF
 
 done
    cat >> "../test/config_test.cpp" << EOF
-   return 0;
+   return error_count;
 }
 EOF