[lmi-commits] [4811] Resolve unit-test build issues with an ancient compiler

[Greg Chicares]

Revision: 4811
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4811
Author:   chicares
Date:     2010-03-24 12:07:20 +0000 (Wed, 24 Mar 2010)
Log Message:
-----------
Resolve unit-test build issues with an ancient compiler

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/bcc_5_5_1.make
    lmi/trunk/callback.hpp
    lmi/trunk/financial_test.cpp
    lmi/trunk/objects.make
    lmi/trunk/obstruct_slicing_test.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-03-24 12:06:14 UTC (rev 4810)
+++ lmi/trunk/ChangeLog 2010-03-24 12:07:20 UTC (rev 4811)
@@ -24623,3 +24623,18 @@
   version.hpp
 Mark release candidate.
 
+20100324T1206Z <address@hidden> [761]
+
+  fenv_lmi_test.cpp
+Include a required header, resolving a GNU/Linux issue. See:
+  http://lists.nongnu.org/archive/html/lmi/2010-03/msg00061.html
+
+20100324T1207Z <address@hidden> [761]
+
+  bcc_5_5_1.make
+  callback.hpp
+  financial_test.cpp
+  objects.make
+  obstruct_slicing_test.cpp
+Resolve unit-test build issues with an ancient compiler.
+

Modified: lmi/trunk/bcc_5_5_1.make
===================================================================
--- lmi/trunk/bcc_5_5_1.make    2010-03-24 12:06:14 UTC (rev 4810)
+++ lmi/trunk/bcc_5_5_1.make    2010-03-24 12:07:20 UTC (rev 4811)
@@ -135,11 +135,19 @@
 # these tests:
 
 excluded_unit_test_targets := \
+  actuarial_table_test \
+  authenticity_test \
   commutation_functions_test \
+  global_settings_test \
   input_test \
+  irc7702a_test \
+  istream_to_string_test \
   loads_test \
   math_functors_test \
   mc_enum_test \
+  mortality_rates_test \
+  path_utility_test \
+  product_file_test \
   regex_test \
   round_test \
   tn_range_test \

Modified: lmi/trunk/callback.hpp
===================================================================
--- lmi/trunk/callback.hpp      2010-03-24 12:06:14 UTC (rev 4810)
+++ lmi/trunk/callback.hpp      2010-03-24 12:07:20 UTC (rev 4811)
@@ -32,9 +32,7 @@
 #if !defined __BORLANDC__
 #   include <boost/static_assert.hpp>
 #   include <boost/type_traits.hpp>
-#else  // Defined __BORLANDC__ .
-#   define BOOST_STATIC_ASSERT(deliberately_ignored) class IgNoRe
-#endif // Defined __BORLANDC__ .
+#endif // !defined __BORLANDC__
 
 #include <boost/utility.hpp>
 
@@ -109,9 +107,11 @@
     :private boost::noncopyable
     ,virtual private obstruct_slicing<callback<FunctionPointer> >
 {
+#if !defined __BORLANDC__
     BOOST_STATIC_ASSERT(boost::is_pointer<FunctionPointer>::value);
     typedef typename boost::remove_pointer<FunctionPointer>::type f_type;
     BOOST_STATIC_ASSERT(boost::is_function<f_type>::value);
+#endif // !defined __BORLANDC__
 
   public:
     FunctionPointer operator()() const;

Modified: lmi/trunk/financial_test.cpp
===================================================================
--- lmi/trunk/financial_test.cpp        2010-03-24 12:06:14 UTC (rev 4810)
+++ lmi/trunk/financial_test.cpp        2010-03-24 12:07:20 UTC (rev 4811)
@@ -31,7 +31,9 @@
 #include "test_tools.hpp"
 #include "timer.hpp"
 
-#include <boost/bind.hpp>
+#if !defined __BORLANDC__
+#   include <boost/bind.hpp>
+#endif // !defined __BORLANDC__
 
 #include <cmath>    // std::fabs()
 #include <iomanip>  // Formatting of optional detail.
@@ -177,6 +179,7 @@
         <= tolerance
         );
 
+#if !defined __BORLANDC__
     typedef std::vector<double>::iterator VI;
     int const decimals = 5;
     std::cout
@@ -197,6 +200,7 @@
             )
         << '\n'
         ;
+#endif // !defined __BORLANDC__
 
     return 0;
 }

Modified: lmi/trunk/objects.make
===================================================================
--- lmi/trunk/objects.make      2010-03-24 12:06:14 UTC (rev 4810)
+++ lmi/trunk/objects.make      2010-03-24 12:07:20 UTC (rev 4811)
@@ -567,6 +567,7 @@
   $(common_test_objects) \
   calendar_date.o \
   calendar_date_test.o \
+  facets.o \
   null_stream.o \
   timer.o \
 
@@ -608,6 +609,7 @@
 
 financial_test$(EXEEXT): \
   $(common_test_objects) \
+  facets.o \
   financial_test.o \
   null_stream.o \
   stratified_algorithms.o \
@@ -889,6 +891,7 @@
 
 zero_test$(EXEEXT): \
   $(common_test_objects) \
+  facets.o \
   null_stream.o \
   zero_test.o \
 

Modified: lmi/trunk/obstruct_slicing_test.cpp
===================================================================
--- lmi/trunk/obstruct_slicing_test.cpp 2010-03-24 12:06:14 UTC (rev 4810)
+++ lmi/trunk/obstruct_slicing_test.cpp 2010-03-24 12:07:20 UTC (rev 4811)
@@ -31,7 +31,9 @@
 #include "test_tools.hpp"
 #include "timer.hpp"
 
-#include <boost/bind.hpp>
+#if !defined __BORLANDC__
+#   include <boost/bind.hpp>
+#endif // !defined __BORLANDC__
 
 #include <string>
 
@@ -144,12 +146,14 @@
 template<typename T>
 void test_cost_of_obstruction(std::string const& s)
 {
+#if !defined __BORLANDC__
     std::cout
         << "  Class " << s << " has size " << sizeof(T) << '\n'
         << "  Speed test: \n      "
         << TimeAnAliquot(boost::bind(mete<T>, 0))
         << '\n'
         ;
+#endif // !defined __BORLANDC__
 }
 
 int test_main(int, char*[])
@@ -159,8 +163,10 @@
     // Correctness is verifiable only at compile time. At run time,
     // there's nothing to test except the cost.
 
+#if !defined __BORLANDC__
     test_cost_of_obstruction<X0>("X0");
     test_cost_of_obstruction<X1>("X1");
+#endif // !defined __BORLANDC__
 
     return EXIT_SUCCESS;
 }