[lmi-commits] (no subject)

[Greg Chicares]

branch: master
commit 11d50a51f7e7b118cac8c24c45e2b6856b8572dc
Author: Gregory W. Chicares <address@hidden>
Date:   Sun Jun 5 03:16:06 2016 +0000

    Remove some obsolete borland workarounds
---
 configurable_settings.hpp |    9 +--------
 global_settings.hpp       |    9 +--------
 numeric_io_cast.hpp       |   49 ---------------------------------------------
 tn_range_test.cpp         |    6 ------
 xml_serializable.tpp      |    5 -----
 5 files changed, 2 insertions(+), 76 deletions(-)

diff --git a/configurable_settings.hpp b/configurable_settings.hpp
index 9d46c32..1787c9a 100644
--- a/configurable_settings.hpp
+++ b/configurable_settings.hpp
@@ -72,6 +72,7 @@ class LMI_SO configurable_settings
 
   private:
     configurable_settings();
+    ~configurable_settings();
 
     void ascribe_members();
     void load();
@@ -109,14 +110,6 @@ class LMI_SO configurable_settings
     std::string spreadsheet_file_extension_;
     bool        use_builtin_calculation_summary_;
     std::string xsl_fo_command_;
-
-#if defined __BORLANDC__
-// COMPILER !! Borland compilers defectively [11/5] require a public dtor; see:
-// http://groups.google.com/groups?selm=7ei6fi%244me%241%40nnrp1.dejanews.com
-// 
http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=m3k9fc25dj.fsf%40gabi-soft.fr
-  public:
-#endif // defined __BORLANDC__
-    ~configurable_settings();
 };
 
 std::vector<std::string>        input_calculation_summary_columns();
diff --git a/global_settings.hpp b/global_settings.hpp
index f2a44ca..cc43db8 100644
--- a/global_settings.hpp
+++ b/global_settings.hpp
@@ -91,6 +91,7 @@ class LMI_SO global_settings
 
   private:
     global_settings();
+    ~global_settings();
 
     bool mellon_;
     bool ash_nazg_;
@@ -99,14 +100,6 @@ class LMI_SO global_settings
     bool regression_testing_;
     fs::path data_directory_;
     calendar_date prospicience_date_;
-
-#if defined __BORLANDC__
-// COMPILER !! Borland compilers defectively [11/5] require a public dtor; see:
-// http://groups.google.com/groups?selm=7ei6fi%244me%241%40nnrp1.dejanews.com
-// 
http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=m3k9fc25dj.fsf%40gabi-soft.fr
-  public:
-#endif // defined __BORLANDC__
-    ~global_settings();
 };
 
 #endif // global_settings_hpp
diff --git a/numeric_io_cast.hpp b/numeric_io_cast.hpp
index 2a4e684..3004350 100644
--- a/numeric_io_cast.hpp
+++ b/numeric_io_cast.hpp
@@ -218,38 +218,6 @@ struct numeric_converter<To, char const*>
         }
 };
 
-#if defined __BORLANDC__
-// COMPILER !! The borland compiler fails to ignore top-level
-// cv-qualifiers as 14.8.2/1 requires. Reference:
-//   http://groups.google.com/address@hidden
-//
-template<typename To>
-struct numeric_converter<To, std::string const>
-{
-    typedef std::string From;
-    To operator()(From const& from) const
-        {
-        numeric_converter<To,std::string> z;
-        return z(from);
-        }
-};
-
-// COMPILER !! The borland compiler needs this to convert from a
-// string literal. It seems to type such constants as [non-const]
-// char*, ignoring 4.2/2 .
-//
-template<typename To>
-struct numeric_converter<To, char*>
-{
-    typedef char const* From;
-    To operator()(From const& from) const
-        {
-        numeric_converter<To,std::string> z;
-        return z(from);
-        }
-};
-#endif // defined __BORLANDC__
-
 // Conversion from arithmetic type to string uses maximum accurate
 // precision for floating point.
 //
@@ -332,23 +300,6 @@ struct numeric_converter<std::string, std::string>
         }
 };
 
-#if defined __BORLANDC__
-// COMPILER !! The borland compiler needs this to convert from a
-// string literal. It seems to type such constants as [non-const]
-// char*, ignoring 4.2/2 .
-//
-template<>
-struct numeric_converter<std::string, char*>
-{
-    typedef char* From;
-    typedef std::string To;
-    To operator()(From const& from) const
-        {
-        return from;
-        }
-};
-#endif // defined __BORLANDC__
-
 template<>
 struct numeric_converter<std::string, char const*>
 {
diff --git a/tn_range_test.cpp b/tn_range_test.cpp
index 0bf37db..ae3aaab 100644
--- a/tn_range_test.cpp
+++ b/tn_range_test.cpp
@@ -233,12 +233,6 @@ void tn_range_test::test_percentages(char const* file, int 
line)
 {
     // These workarounds for negative one permit running these tests
     // with unsigned percentage types, and avoid compiler warnings.
-#if defined __BORLANDC__
-    // COMPILER !! This definition somehow makes borland happy. See
-    //  
http://groups.google.com/groups?selm=4196a049%241%40newsgroups.borland.com
-    T::number_type work_around_borland_defect;
-    &work_around_borland_defect;
-#endif // defined __BORLANDC__
     typedef typename T::number_type N;
     // Use this to test whether -1 is valid.
     N n1 = static_cast<N>(-1);
diff --git a/xml_serializable.tpp b/xml_serializable.tpp
index 71c41e8..f94ab3d 100644
--- a/xml_serializable.tpp
+++ b/xml_serializable.tpp
@@ -108,11 +108,6 @@ void xml_serializable<T>::read(xml::element const& x)
         handle_missing_version_attribute();
         }
 
-// COMPILER !! Borland doesn't find operator==() in ns xml.
-#if defined __BORLANDC__
-using namespace xml;
-#endif // defined __BORLANDC__
-
     std::ostringstream oss;
 
     std::map<std::string,value_type> detritus_map;