diff -cr boost/releaseInfo boost-manip/releaseInfo *** boost/releaseInfo Thu Jun 2 13:32:14 2005 --- boost-manip/releaseInfo Wed Sep 7 20:16:15 2005 *************** *** 1 **** ! ? | ? | boost-1.32.0 | 050307 | ? --- 1 ---- ! ? | ? | boost-1.32.0 | 050907 | ? diff -cr boost/boost/function.hpp boost-manip/boost/function.hpp *** boost/boost/function.hpp Thu Jun 2 13:28:53 2005 --- boost-manip/boost/function.hpp Wed Sep 7 20:11:00 2005 *************** *** 22,28 **** #include // Visual Age C++ doesn't handle the file iteration well ! #if BOOST_WORKAROUND(__IBMCPP__, <= 600) # if BOOST_FUNCTION_MAX_ARGS >= 0 # include # endif --- 22,28 ---- #include // Visual Age C++ doesn't handle the file iteration well ! #if BOOST_WORKAROUND(__IBMCPP__, >= 500) # if BOOST_FUNCTION_MAX_ARGS >= 0 # include # endif diff -cr boost/boost/numeric/interval/detail/ppc_rounding_control.hpp boost-manip/boost/numeric/interval/detail/ppc_rounding_control.hpp *** boost/boost/numeric/interval/detail/ppc_rounding_control.hpp Thu Jun 2 13:29:15 2005 --- boost-manip/boost/numeric/interval/detail/ppc_rounding_control.hpp Wed Sep 7 20:11:36 2005 *************** *** 11,19 **** #ifndef BOOST_NUMERIC_INTERVAL_DETAIL_PPC_ROUNDING_CONTROL_HPP #define BOOST_NUMERIC_INTERVAL_DETAIL_PPC_ROUNDING_CONTROL_HPP ! #ifndef __GNUC__ ! #error This header only works with GNU CC. ! #endif #if !defined(powerpc) && !defined(__powerpc__) && !defined(__ppc__) #error This header only works on PPC CPUs. --- 11,19 ---- #ifndef BOOST_NUMERIC_INTERVAL_DETAIL_PPC_ROUNDING_CONTROL_HPP #define BOOST_NUMERIC_INTERVAL_DETAIL_PPC_ROUNDING_CONTROL_HPP ! //#ifndef __GNUC__ ! //#error This header only works with GNU CC. ! //#endif #if !defined(powerpc) && !defined(__powerpc__) && !defined(__ppc__) #error This header only works on PPC CPUs. diff -cr boost/boost/python/detail/def_helper.hpp boost-manip/boost/python/detail/def_helper.hpp *** boost/boost/python/detail/def_helper.hpp Thu Jun 2 13:29:23 2005 --- boost-manip/boost/python/detail/def_helper.hpp Wed Sep 7 20:11:49 2005 *************** *** 155,161 **** , T3 const& , T4 const& , default_call_policies ! , keywords<0> , char const* , void(not_specified::*)() // A function pointer type which is never an // appropriate default implementation --- 155,161 ---- , T3 const& , T4 const& , default_call_policies ! , boost::python::detail::keywords<0> , char const* , void(not_specified::*)() // A function pointer type which is never an // appropriate default implementation diff -cr boost/boost/test/detail/unit_test_config.hpp boost-manip/boost/test/detail/unit_test_config.hpp *** boost/boost/test/detail/unit_test_config.hpp Thu Jun 2 13:29:35 2005 --- boost-manip/boost/test/detail/unit_test_config.hpp Wed Sep 7 20:12:09 2005 *************** *** 26,32 **** #endif #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)) || \ ! BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600)) || \ (defined __sgi && BOOST_WORKAROUND(_COMPILER_VERSION, BOOST_TESTED_AT(730))) #define BOOST_TEST_SHIFTED_LINE #endif --- 26,32 ---- #endif #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)) || \ ! BOOST_WORKAROUND(__IBMCPP__, <=700) || \ (defined __sgi && BOOST_WORKAROUND(_COMPILER_VERSION, BOOST_TESTED_AT(730))) #define BOOST_TEST_SHIFTED_LINE #endif diff -cr boost/libs/test/test/prg_exec_fail2.cpp boost-manip/libs/test/test/prg_exec_fail2.cpp *** boost/libs/test/test/prg_exec_fail2.cpp Thu Jun 2 13:31:39 2005 --- boost-manip/libs/test/test/prg_exec_fail2.cpp Wed Sep 7 20:15:14 2005 *************** *** 26,31 **** --- 26,32 ---- #include //Metrowerks linker needs at least one standard library #endif + #pragma options check=divzero int cpp_main( int, char *[] ) // note the name { diff -cr boost/libs/test/test/test_tools_test.cpp boost-manip/libs/test/test/test_tools_test.cpp *** boost/libs/test/test/test_tools_test.cpp Thu Jun 2 13:31:39 2005 --- boost-manip/libs/test/test/test_tools_test.cpp Wed Sep 7 20:15:14 2005 *************** *** 608,632 **** testlist.push_back( 7 ); // 6 testlist.push_back( 7 ); ! #if !defined(__BORLANDC__) CHECK_TOOL_USAGE( BOOST_CHECK_EQUAL_COLLECTIONS( testlist.begin(), testlist.end(), pattern ), output.is_equal( CHECK_PATTERN( "error in " TEST_CASE_NAME ": test {testlist.begin(), testlist.end()} == {pattern, ...} failed in a position 2 [4 != 3]\n" ! << normalize_file_name( __FILE__ ) << "(" << __LINE__ << "): " << "error in " TEST_CASE_NAME ": test {testlist.begin(), testlist.end()} == {pattern, ...} failed in a position 5 [7 != 6]\n" , 6 ) ) ); #else CHECK_TOOL_USAGE( BOOST_CHECK_EQUAL_COLLECTIONS( testlist.begin(), testlist.end(), pattern ), output.is_equal( CHECK_PATTERN( "error in " TEST_CASE_NAME ": test {testlist.begin(), testlist.end()} == {pattern, ...} failed in a position 2 [4 != 3]\n" ! << normalize_file_name( __FILE__ ) << "(" << (__LINE__-6) << "): " << "error in " TEST_CASE_NAME ": test {testlist.begin(), testlist.end()} == {pattern, ...} failed in a position 5 [7 != 6]\n" , 6 ) ) ); #endif } --- 608,642 ---- testlist.push_back( 7 ); // 6 testlist.push_back( 7 ); ! #if defined(__BORLANDC__) CHECK_TOOL_USAGE( BOOST_CHECK_EQUAL_COLLECTIONS( testlist.begin(), testlist.end(), pattern ), output.is_equal( CHECK_PATTERN( "error in " TEST_CASE_NAME ": test {testlist.begin(), testlist.end()} == {pattern, ...} failed in a position 2 [4 != 3]\n" ! << normalize_file_name( __FILE__ ) << "(" << (__LINE__-6) << "): " << "error in " TEST_CASE_NAME ": test {testlist.begin(), testlist.end()} == {pattern, ...} failed in a position 5 [7 != 6]\n" , 6 ) ) ); + #elif BOOST_WORKAROUND(__IBMCPP__, <=700) + CHECK_TOOL_USAGE( + BOOST_CHECK_EQUAL_COLLECTIONS( testlist.begin(), testlist.end(), pattern ), + output.is_equal( CHECK_PATTERN( + "error in " TEST_CASE_NAME ": test {testlist.begin(), testlist.end()} == {pattern, ...} failed in a position 2 [4 != 3]\n" + << normalize_file_name( __FILE__ ) << "(" << (__LINE__-3) << "): " + << "error in " TEST_CASE_NAME ": test {testlist.begin(), testlist.end()} == {pattern, ...} failed in a position 5 [7 != 6]\n" + , 6 ) ) + ); #else CHECK_TOOL_USAGE( BOOST_CHECK_EQUAL_COLLECTIONS( testlist.begin(), testlist.end(), pattern ), output.is_equal( CHECK_PATTERN( "error in " TEST_CASE_NAME ": test {testlist.begin(), testlist.end()} == {pattern, ...} failed in a position 2 [4 != 3]\n" ! << normalize_file_name( __FILE__ ) << "(" << __LINE__ << "): " << "error in " TEST_CASE_NAME ": test {testlist.begin(), testlist.end()} == {pattern, ...} failed in a position 5 [7 != 6]\n" , 6 ) ) ); #endif + } diff -cr boost/tools/build/v1/allyourbase.jam boost-manip/tools/build/v1/allyourbase.jam *** boost/tools/build/v1/allyourbase.jam Thu Jun 2 13:31:55 2005 --- boost-manip/tools/build/v1/allyourbase.jam Wed Sep 7 20:16:13 2005 *************** *** 2138,2144 **** $(RANLIB) "$(<)" } ! actions quietly updated piecemeal together RmTemps { $(RM) "$(>)" } --- 2138,2144 ---- $(RANLIB) "$(<)" } ! actions quietly ignore updated piecemeal together RmTemps { $(RM) "$(>)" } diff -cr boost/tools/build/v1/python.jam boost-manip/tools/build/v1/python.jam *** boost/tools/build/v1/python.jam Thu Jun 2 13:31:58 2005 --- boost-manip/tools/build/v1/python.jam Wed Sep 7 20:15:47 2005 *************** *** 413,424 **** { LINK_LIBPATH on $(<) = [ join $(gRUN_LD_LIBRARY_PATH($(<))) : $(SPLITPATH) ] ; ! if $(OS) = AIX ! { # explicitly designate the exported init function ! LINKFLAGS on $(<) += "-e init$(<[1]:B)" ; ! Aix-Implib-Action $(<) : $(>) ; ! } } gRUN_PYTHONPATH($(<)) += $(gLOCATE($(<[1]))) ; .do-link $(<) : $(>) : PYD ; --- 413,424 ---- { LINK_LIBPATH on $(<) = [ join $(gRUN_LD_LIBRARY_PATH($(<))) : $(SPLITPATH) ] ; ! #if $(OS) = AIX ! #{ # explicitly designate the exported init function ! # LINKFLAGS on $(<) += "-e init$(<[1]:B)" ; ! # Aix-Implib-Action $(<) : $(>) ; ! #} } gRUN_PYTHONPATH($(<)) += $(gLOCATE($(<[1]))) ; .do-link $(<) : $(>) : PYD ; diff -cr boost/tools/build/v1/vacpp-tools.jam boost-manip/tools/build/v1/vacpp-tools.jam *** boost/tools/build/v1/vacpp-tools.jam Thu Jun 2 13:31:58 2005 --- boost-manip/tools/build/v1/vacpp-tools.jam Wed Sep 7 20:16:13 2005 *************** *** 34,39 **** --- 34,42 ---- # This disables the automatic generation of separate include files for # template functions and class declarations. flags vacpp C++FLAGS : -qnotempinc ; + flags vacpp C++FLAGS : -qnotemplateregistry ; + #flags vacpp C++FLAGS : -qnoweaksymbol ; + #flags vacpp C++FLAGS : -g ; # The following is needed to get rid of most of the annoying linker warnings # about duplicated symbols when you use templates. *************** *** 46,52 **** flags vacpp CFLAGS off : -qNOOPTimize ; flags vacpp CFLAGS default : -O ; ! flags vacpp CFLAGS speed : -O3 -qstrict ; flags vacpp CFLAGS space : -O2 -qcompact ; flags vacpp CFLAGS off : -qnoinline ; --- 49,57 ---- flags vacpp CFLAGS off : -qNOOPTimize ; flags vacpp CFLAGS default : -O ; ! flags vacpp CFLAGS two : -O2 ; ! flags vacpp CFLAGS three : -O3 ; ! flags vacpp CFLAGS four : -O4 ; flags vacpp CFLAGS space : -O2 -qcompact ; flags vacpp CFLAGS off : -qnoinline ; *************** *** 62,68 **** flags vacpp LINKFLAGS static : -bstatic ; # We want the full path to the sources in the debug symbols because otherwise # the debugger won't find the sources when we use boost.build. ! flags vacpp CFLAGS on : -g -qfullpath ; flags vacpp LINKFLAGS on : -g ; flags vacpp LINKFLAGS off : -s ; --- 67,73 ---- flags vacpp LINKFLAGS static : -bstatic ; # We want the full path to the sources in the debug symbols because otherwise # the debugger won't find the sources when we use boost.build. ! flags vacpp CFLAGS on : -qfullpath ; flags vacpp LINKFLAGS on : -g ; flags vacpp LINKFLAGS off : -s ; *************** *** 69,80 **** flags vacpp CFLAGS on : -pg ; flags vacpp LINKFLAGS on : -pg ; flags vacpp CFLAGS ; flags vacpp C++FLAGS ; flags vacpp DEFINES ; flags vacpp UNDEFS ; flags vacpp HDRS ; ! flags vacpp SYSHDRS ; flags vacpp LINKFLAGS ; flags vacpp ARFLAGS ; --- 74,87 ---- flags vacpp CFLAGS on : -pg ; flags vacpp LINKFLAGS on : -pg ; + flags vacpp C++FLAGS on : -qpic ; + flags vacpp CFLAGS ; flags vacpp C++FLAGS ; flags vacpp DEFINES ; flags vacpp UNDEFS ; flags vacpp HDRS ; ! flags vacpp STDHDRS ; flags vacpp LINKFLAGS ; flags vacpp ARFLAGS ; *************** *** 87,104 **** flags xlc ARFLAGS : "" ; } - # Clear the STDHDRS variable which contains /usr/include. Vacpp does not like - # that this sys directory is included (vacpp related headers are in - # /usr/vacpp/include) - STDHDRS = ; - #### Link #### - rule Link-action { if $(gTARGET_TYPE($(<))) = EXE { ! LINKFLAGS on $(<) += -brtl ; } if $(gTARGET_TYPE($(<))) in $(SHARED_TYPES) { --- 94,114 ---- flags xlc ARFLAGS : "" ; } #### Link #### rule Link-action { if $(gTARGET_TYPE($(<))) = EXE { ! if $(UNIX) ! { ! switch $(JAMUNAME) ! { ! case AIX* : ! { ! LINKFLAGS on $(<) += -brtl -bdynamic ; ! } ! } ! } } if $(gTARGET_TYPE($(<))) in $(SHARED_TYPES) { *************** *** 112,118 **** { $(SHELL_SET)$(gSHELL_LIBPATH)=$(LINK_LIBPATH)$(gAPPEND_LD_LIBRARY_PATH) $(SHELL_EXPORT)$(gSHELL_LIBPATH) ! $(VA_CXX_COMPILER:R=$(VA_TOOL_PATH)) $(LINKFLAGS) -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -bdynamic -l$(FINDLIBS) } #### Cc ##### --- 122,128 ---- { $(SHELL_SET)$(gSHELL_LIBPATH)=$(LINK_LIBPATH)$(gAPPEND_LD_LIBRARY_PATH) $(SHELL_EXPORT)$(gSHELL_LIBPATH) ! $(VA_CXX_COMPILER:R=$(VA_TOOL_PATH)) $(LINKFLAGS) -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) } #### Cc ##### *************** *** 125,131 **** # Always allow C++ comments in C source files! actions xlc-Cc-action { ! $(VA_C_COMPILER:R=$(VA_TOOL_PATH)) -qcpluscmt -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -I"$(SYSHDRS)" -o "$(<)" "$(>)" } #### C++ #### --- 135,141 ---- # Always allow C++ comments in C source files! actions xlc-Cc-action { ! $(VA_C_COMPILER:R=$(VA_TOOL_PATH)) -qcpluscmt -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)" } #### C++ #### *************** *** 136,142 **** actions xlc-C++-action { ! $(VA_CXX_COMPILER:R=$(VA_TOOL_PATH)) -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -I"$(SYSHDRS)" -o "$(<)" "$(>)" } #### Archive #### --- 146,152 ---- actions xlc-C++-action { ! $(VA_CXX_COMPILER:R=$(VA_TOOL_PATH)) -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)" } #### Archive #### diff -cr boost/tools/regression/compiler_status.cpp boost-manip/tools/regression/compiler_status.cpp *** boost/tools/regression/compiler_status.cpp Thu Jun 2 13:32:10 2005 --- boost-manip/tools/regression/compiler_status.cpp Wed Sep 7 20:16:10 2005 *************** *** 687,693 **** // - Boost.Build V1 location without ALL_LOCATE_TARGET string relative( fs::initial_path().string() ); relative.erase( 0, boost_root.string().size()+1 ); ! fs::path bin_path( locate_root / "bin/boost" / relative ); if (!fs::exists(bin_path)) { bin_path = locate_root / "bin/status/bin"; --- 687,693 ---- // - Boost.Build V1 location without ALL_LOCATE_TARGET string relative( fs::initial_path().string() ); relative.erase( 0, boost_root.string().size()+1 ); ! fs::path bin_path( locate_root / "bin/boost" / relative / "status" ); if (!fs::exists(bin_path)) { bin_path = locate_root / "bin/status/bin"; diff -cr boost/tools/regression/run_tests.sh boost-manip/tools/regression/run_tests.sh *** boost/tools/regression/run_tests.sh Thu Jun 2 13:32:10 2005 --- boost-manip/tools/regression/run_tests.sh Wed Sep 7 20:16:10 2005 *************** *** 15,21 **** # This can be either a non-exitent directory or an already complete Boost # source tree. # ! boost_root="$HOME/CVSROOTs/Boost/boost_regression" # # Wether to fetch the most current Boost code from CVS (yes/no): --- 15,22 ---- # This can be either a non-exitent directory or an already complete Boost # source tree. # ! #boost_root="$HOME/CVSROOTs/Boost/boost_regression" ! boost_root=/home/montana/boost/boost-1.32.0 # # Wether to fetch the most current Boost code from CVS (yes/no): *************** *** 32,38 **** # regression tests. Specify a space separated list, of the Boost.Build toolsets. # Each will be built and tested in sequence. # ! test_tools=gcc # # "toolset" is the Boost.Build toolset to use for building the helper programs. --- 33,39 ---- # regression tests. Specify a space separated list, of the Boost.Build toolsets. # Each will be built and tested in sequence. # ! test_tools=vacpp # # "toolset" is the Boost.Build toolset to use for building the helper programs. *************** *** 39,51 **** # This is usually different than the toolsets one is testing. And this is # normally a toolset that corresponds to the compiler built into your platform. # ! toolset=gcc # # "comment_path" is the path to an html-file describing the test environment. # The content of this file will be embedded in the status pages being produced. # ! comment_path="$boost_root/../regression_comment.html" ### DEFAULTS ARE OK FOR THESE. --- 40,52 ---- # This is usually different than the toolsets one is testing. And this is # normally a toolset that corresponds to the compiler built into your platform. # ! toolset=vacpp # # "comment_path" is the path to an html-file describing the test environment. # The content of this file will be embedded in the status pages being produced. # ! comment_path=$boost_root/../regression_comment.html ### DEFAULTS ARE OK FOR THESE. *************** *** 63,69 **** # The location of the binary for running bjam. The default should work # under most circumstances. # ! bjam="$boost_root/tools/build/jam_src/bin/bjam$exe_suffix" # # "process_jam_log", and "compiler_status" paths to built helper programs: --- 64,70 ---- # The location of the binary for running bjam. The default should work # under most circumstances. # ! bjam=$boost_root/tools/build/jam_src/bin/bjam$exe_suffix # # "process_jam_log", and "compiler_status" paths to built helper programs: *************** *** 70,82 **** # The location of the executables of the regression help programs. These # are built locally so the default should work in most situations. # ! process_jam_log="$boost_root/tools/regression/build/run/process_jam_log$exe_suffix" ! compiler_status="$boost_root/tools/regression/build/run/compiler_status$exe_suffix" # # "boost_build_path" can point to additional locations to find toolset files. # ! boost_build_path="$HOME/.boost-build" ### NO MORE CONFIGURABLE PARTS. --- 71,85 ---- # The location of the executables of the regression help programs. These # are built locally so the default should work in most situations. # ! process_jam_log=$boost_root/tools/regression/build/run/process_jam_log$exe_suffix ! #temporary kludge to get results. need to fix up problem with compiler_status ! #compiler_status=$boost_root/tools/regression/build/run/compiler_status$exe_suffix ! compiler_status=$boost_root/../boost-1.32.0/tools/regression/build/run/compiler_status$exe_suffix # # "boost_build_path" can point to additional locations to find toolset files. # ! boost_build_path=$HOME/.boost-build ### NO MORE CONFIGURABLE PARTS. *************** *** 84,90 **** # # Some setup. # ! boost_dir=`basename "$boost_root"` if test -n "${BOOST_BUILD_PATH}" ; then export BOOST_BUILD_PATH="$boost_build_path:$BOOST_BUILD_PATH" else --- 87,93 ---- # # Some setup. # ! boost_dir=`basename $boost_root` if test -n "${BOOST_BUILD_PATH}" ; then export BOOST_BUILD_PATH="$boost_build_path:$BOOST_BUILD_PATH" else *************** *** 173,178 **** --- 176,182 ---- uname=`uname` echo generating html tables: "$compiler_status" --comment "$comment_path" "$boost_root" cs-$uname.html cs-$uname-links.html + $compiler_status $boost_root cs-$uname.html cs-$uname-links.html if test $? != 0 ; then echo "Failed HTML result table generation." exit 256 diff -cr boost/tools/regression/xsl_reports/make_snapshot.py boost-manip/tools/regression/xsl_reports/make_snapshot.py *** boost/tools/regression/xsl_reports/make_snapshot.py Thu Jun 2 13:32:10 2005 --- boost-manip/tools/regression/xsl_reports/make_snapshot.py Wed Sep 7 20:16:10 2005 *************** *** 84,90 **** rmtree( sources_dir ) raise ! timestamped_dir_name = 'boost-%s-%s' % ( tag, time.strftime( '%y-%m-%d-6/2/05M', time.gmtime() ) ) timestamped_dir = os.path.join( working_dir, timestamped_dir_name ) utils.log( 'Renaming "%s" to "%s"...' % ( sources_dir, timestamped_dir ) ) --- 84,90 ---- rmtree( sources_dir ) raise ! timestamped_dir_name = 'boost-%s-%s' % ( tag, time.strftime( '%y-%m-%d-9/7/05M', time.gmtime() ) ) timestamped_dir = os.path.join( working_dir, timestamped_dir_name ) utils.log( 'Renaming "%s" to "%s"...' % ( sources_dir, timestamped_dir ) )