[lmi-commits] [lmi] master 368ee55 7/7: Eradicate the boost regex library

[Greg Chicares]

branch: master
commit 368ee557fdb3b20a55a6d9a6db436ca763fd4739
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Eradicate the boost regex library
---
 Makefile.am     | 85 +++++++++++++++++----------------------------------------
 boost_regex.hpp | 57 --------------------------------------
 configure.ac    | 55 -------------------------------------
 objects.make    | 30 --------------------
 workhorse.make  | 28 -------------------
 5 files changed, 25 insertions(+), 230 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 24c87a1..b38e0e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,9 +52,12 @@ bin_PROGRAMS = \
     ihs_crc_comp \
     product_files \
     rate_table_tool \
-    test_coding_rules \
     wx_test
 
+if !LMI_MSW
+  bin_PROGRAMS += test_coding_rules
+endif
+
 # MD5 !! 'objects.make' copies lmi_md5sum$(EXEEXT) to $localbindir,
 # which is not a standard autotools directory. This doesn't matter
 # for production, because lmi itself no longer calls an external
@@ -244,7 +247,6 @@ libskeleton_la_LIBADD = \
     libwx_new.la \
     $(XMLWRAPP_LIBS) \
     $(GTK_LIBS) \
-    $(BOOST_LIBS) \
     $(WXPDFDOC_LIBS) \
     $(WX_LIBS)
 
@@ -263,7 +265,6 @@ lmi_wx_LDADD = \
     libwx_new.la \
     $(XMLWRAPP_LIBS) \
     $(GTK_LIBS) \
-    $(BOOST_LIBS) \
     $(WXPDFDOC_LIBS) \
     $(WX_LIBS)
 if LMI_MSW
@@ -285,8 +286,7 @@ lmi_cli_SOURCES = \
 lmi_cli_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 lmi_cli_LDADD = \
     liblmi.la \
-    $(XMLWRAPP_LIBS) \
-    $(BOOST_LIBS)
+    $(XMLWRAPP_LIBS)
 
 wx_test_SOURCES = \
   main_wx_test.cpp \
@@ -311,7 +311,6 @@ wx_test_LDADD = \
     libwx_new.la \
     $(XMLWRAPP_LIBS) \
     $(GTK_LIBS) \
-    $(BOOST_LIBS) \
     $(WXPDFDOC_LIBS) \
     $(WX_LIBS)
 
@@ -419,8 +418,6 @@ libantediluvian_la_SOURCES = \
 libantediluvian_la_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 libantediluvian_la_CFLAGS = $(AM_CFLAGS)
 libantediluvian_la_LDFLAGS = -no-undefined $(AM_LDFLAGS)
-libantediluvian_la_LIBADD = \
-    $(BOOST_LIBS)
 
 liblmi_la_SOURCES = \
     authenticity.cpp \
@@ -470,8 +467,7 @@ liblmi_la_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 liblmi_la_CFLAGS = $(AM_CFLAGS)
 liblmi_la_LDFLAGS = -no-undefined $(AM_LDFLAGS)
 liblmi_la_LIBADD = \
-    $(XMLWRAPP_LIBS) \
-    $(BOOST_LIBS)
+    $(XMLWRAPP_LIBS)
 
 libcgi_la_SOURCES = \
     alert_cgi.cpp \
@@ -498,7 +494,6 @@ lmi_md5sum_SOURCES = \
     md5sum_cli.cpp
 lmi_md5sum_CXXFLAGS = $(AM_CXXFLAGS) $(BOOST_INCLUDE_FLAGS)
 lmi_md5sum_LDADD = \
-    $(BOOST_LIBS) \
     libmain_auxiliary_common.la
 
 # MD5 !! Remove "timer.cpp" below.
@@ -517,7 +512,6 @@ generate_passkey_SOURCES = \
     timer.cpp
 generate_passkey_CXXFLAGS = $(AM_CXXFLAGS)
 generate_passkey_LDADD = \
-    $(BOOST_LIBS) \
     libmain_auxiliary_common.la
 
 elapsed_time_SOURCES = \
@@ -533,8 +527,7 @@ antediluvian_cgi_CXXFLAGS = $(AM_CXXFLAGS) 
$(BOOST_INCLUDE_FLAGS)
 antediluvian_cgi_LDADD = \
     libcgi.la \
     libantediluvian.la \
-    $(CGICC_LIBS) \
-    $(BOOST_LIBS)
+    $(CGICC_LIBS)
 
 antediluvian_cli_SOURCES = \
     $(cli_sources)
@@ -542,7 +535,6 @@ antediluvian_cli_CXXFLAGS = $(AM_CXXFLAGS) 
$(XMLWRAPP_CFLAGS)
 antediluvian_cli_LDADD = \
     libantediluvian.la \
     liblmi.la \
-    $(BOOST_LIBS) \
     $(XMLWRAPP_LIBS)
 
 ihs_crc_comp_SOURCES = ihs_crc_comp.cpp
@@ -562,7 +554,6 @@ product_files_SOURCES = \
     my_tier.cpp
 product_files_LDADD = \
     liblmi.la \
-    $(BOOST_LIBS) \
     $(XMLWRAPP_LIBS)
 
 rate_table_tool_SOURCES = \
@@ -573,7 +564,6 @@ rate_table_tool_SOURCES = \
     rate_table_tool.cpp
 rate_table_tool_LDADD = \
     liblmi.la \
-    $(BOOST_LIBS) \
     $(XMLWRAPP_LIBS)
 
 test_coding_rules_SOURCES = \
@@ -586,10 +576,10 @@ test_coding_rules_SOURCES = \
   my_test_coding_rules.cpp \
   sigfpe.cpp \
   test_coding_rules.cpp
-test_coding_rules_CXXFLAGS = $(AM_CXXFLAGS) $(BOOST_INCLUDE_FLAGS)
+test_coding_rules_CXXFLAGS = $(AM_CXXFLAGS) $(BOOST_INCLUDE_FLAGS) 
$(PCRE2_CFLAGS)
 test_coding_rules_LDADD = \
   libmain_auxiliary_common.la \
-  $(BOOST_LIBS)
+  $(PCRE2_LIBS)
 
 # unit tests
 libtest_common_la_SOURCES = \
@@ -619,15 +609,13 @@ actuarial_table_test_SOURCES = \
 actuarial_table_test_CXXFLAGS = $(AM_CXXFLAGS)
 actuarial_table_test_LDADD = \
   libtest_common.la \
-  $(BOOST_LIBS) \
   $(XMLWRAPP_LIBS)
 
 alert_test_LDADD = \
   libtest_common.la
 
 any_member_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 assert_lmi_test_LDADD = \
   libtest_common.la
@@ -641,15 +629,13 @@ authenticity_test_SOURCES = \
   system_command_non_wx.cpp
 authenticity_test_CXXFLAGS = $(AM_CXXFLAGS)
 authenticity_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 bourn_cast_test_LDADD = \
   libtest_common.la
 
 cache_file_reads_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 calendar_date_test_LDADD = \
   libtest_common.la
@@ -679,7 +665,6 @@ configurable_settings_test_SOURCES = \
 configurable_settings_test_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 configurable_settings_test_LDADD = \
   libtest_common.la \
-  $(BOOST_LIBS) \
   $(XMLWRAPP_LIBS)
 
 contains_test_LDADD = \
@@ -742,8 +727,7 @@ getopt_test_LDADD = \
   libtest_common.la
 
 global_settings_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 gpt_cf_triad_test_SOURCES = \
   commutation_functions.cpp \
@@ -753,8 +737,7 @@ gpt_cf_triad_test_SOURCES = \
   ihs_irc7702.cpp
 gpt_cf_triad_test_CXXFLAGS = $(AM_CXXFLAGS)
 gpt_cf_triad_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 gpt_test_SOURCES = \
   commutation_functions.cpp \
@@ -785,8 +768,7 @@ input_seq_test_SOURCES = \
   input_sequence_test.cpp
 input_seq_test_CXXFLAGS = $(AM_CXXFLAGS)
 input_seq_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 input_test_SOURCES = \
   ce_product_name.cpp \
@@ -825,7 +807,6 @@ input_test_SOURCES = \
 input_test_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 input_test_LDADD = \
   libtest_common.la \
-  $(BOOST_LIBS) \
   $(XMLWRAPP_LIBS)
 
 interpolate_string_test_SOURCES = \
@@ -842,8 +823,7 @@ irc7702_tables_test_SOURCES = \
   irc7702_tables_test.cpp
 irc7702_tables_test_CXXFLAGS = $(AM_CXXFLAGS)
 irc7702_tables_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 irc7702a_test_SOURCES = \
   ihs_irc7702a.cpp \
@@ -854,7 +834,6 @@ irc7702a_test_SOURCES = \
 irc7702a_test_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 irc7702a_test_LDADD = \
   libtest_common.la \
-  $(BOOST_LIBS) \
   $(XMLWRAPP_LIBS)
 
 istream_to_string_test_LDADD = \
@@ -879,7 +858,6 @@ ledger_test_SOURCES = \
 ledger_test_CXXFLAGS = $(AM_CXXFLAGS)
 ledger_test_LDADD = \
   libtest_common.la \
-  $(BOOST_LIBS) \
   $(XMLWRAPP_LIBS)
 
 loads_test_SOURCES = \
@@ -906,8 +884,7 @@ mc_enum_test_SOURCES = \
   mc_enum_test_aux.cpp
 mc_enum_test_CXXFLAGS = $(AM_CXXFLAGS)
 mc_enum_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 md5sum_test_SOURCES = \
   md5.cpp \
@@ -915,8 +892,7 @@ md5sum_test_SOURCES = \
   md5sum_test.cpp
 md5sum_test_CXXFLAGS = $(AM_CXXFLAGS)
 md5sum_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 miscellany_test_LDADD = \
   libtest_common.la
@@ -936,8 +912,7 @@ name_value_pairs_test_SOURCES = \
   name_value_pairs_test.cpp
 name_value_pairs_test_CXXFLAGS = $(AM_CXXFLAGS)
 name_value_pairs_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 ncnnnpnn_test_LDADD = \
   libtest_common.la
@@ -946,15 +921,13 @@ null_stream_test_LDADD = \
   libtest_common.la
 
 numeric_io_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 path_utility_test_SOURCES = \
     path_utility_test.cpp \
     wine_workarounds.cpp
 path_utility_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 premium_tax_test_SOURCES = \
   data_directory.cpp \
@@ -976,7 +949,6 @@ premium_tax_test_SOURCES = \
 premium_tax_test_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 premium_tax_test_LDADD = \
   libtest_common.la \
-  $(BOOST_LIBS) \
   $(XMLWRAPP_LIBS)
 
 print_matrix_test_SOURCES = \
@@ -984,8 +956,7 @@ print_matrix_test_SOURCES = \
   print_matrix_test.cpp
 print_matrix_test_CXXFLAGS = $(AM_CXXFLAGS)
 print_matrix_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 product_file_test_SOURCES = \
   data_directory.cpp \
@@ -1010,7 +981,6 @@ product_file_test_SOURCES = \
 product_file_test_CXXFLAGS = $(AM_CXXFLAGS)
 product_file_test_LDADD = \
   libtest_common.la \
-  $(BOOST_LIBS) \
   $(XMLWRAPP_LIBS)
 
 progress_meter_test_SOURCES = \
@@ -1028,12 +998,11 @@ rate_table_test_SOURCES = \
 rate_table_test_CXXFLAGS = $(AM_CXXFLAGS)
 rate_table_test_LDADD = \
   libtest_common.la \
-  $(BOOST_LIBS) \
   $(XMLWRAPP_LIBS)
 
 regex_test_LDADD = \
   libtest_common.la \
-  $(BOOST_LIBS)
+  $(PCRE2_LIBS)
 
 report_table_test_SOURCES = \
   report_table.cpp \
@@ -1099,12 +1068,10 @@ tn_range_test_SOURCES = \
   tn_range_test_aux.cpp
 tn_range_test_CXXFLAGS = $(AM_CXXFLAGS)
 tn_range_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 value_cast_test_LDADD = \
-  libtest_common.la \
-  $(BOOST_LIBS)
+  libtest_common.la
 
 vector_test_LDADD = \
   libtest_common.la
@@ -1118,7 +1085,6 @@ xml_serialize_test_SOURCES = \
 xml_serialize_test_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 xml_serialize_test_LDADD = \
   libtest_common.la \
-  $(BOOST_LIBS) \
   $(XMLWRAPP_LIBS)
 
 zero_test_LDADD = \
@@ -1137,7 +1103,6 @@ noinst_HEADERS = \
     authenticity.hpp \
     basic_tables.hpp \
     basic_values.hpp \
-    boost_regex.hpp \
     bourn_cast.hpp \
     cache_file_reads.hpp \
     calendar_date.hpp \
diff --git a/boost_regex.hpp b/boost_regex.hpp
deleted file mode 100644
index c69fc7e..0000000
--- a/boost_regex.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// Include boost/regex.hpp, guarding it with a pragma.
-//
-// Copyright (C) 2017, 2018, 2019, 2020, 2021 Gregory W. Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// https://savannah.nongnu.org/projects/lmi
-// email: <gchicares@sbcglobal.net>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-#ifndef boost_regex_hpp
-#define boost_regex_hpp
-
-#include "config.hpp"
-
-#if defined LMI_CLANG
-#   pragma clang diagnostic push
-#   pragma clang diagnostic ignored "-Wchar-subscripts"
-#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#   pragma clang diagnostic ignored "-Wdeprecated-copy"
-#   pragma clang diagnostic ignored "-Wkeyword-macro"
-#   pragma clang diagnostic ignored "-Wparentheses-equality"
-#   pragma clang diagnostic ignored "-Wregister"
-#endif // defined LMI_CLANG
-#if defined LMI_GCC
-#   pragma GCC diagnostic push
-#   if 7 <= __GNUC__
-#       pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#       pragma GCC diagnostic ignored "-Wregister"
-#   endif // 7 <= __GNUC__
-#   if 9 <= __GNUC__
-#       pragma GCC diagnostic ignored "-Wdeprecated-copy"
-#   endif // 9 <= __GNUC__
-#   pragma GCC diagnostic ignored "-Wshadow"
-#   pragma GCC diagnostic ignored "-Wswitch-enum"
-#   pragma GCC diagnostic ignored "-Wuseless-cast"
-#endif // defined LMI_GCC
-#include <boost/regex.hpp>
-#if defined LMI_GCC
-#   pragma GCC diagnostic pop
-#endif // defined LMI_GCC
-#if defined LMI_CLANG
-#   pragma clang diagnostic pop
-#endif // defined LMI_CLANG
-
-#endif // boost_regex_hpp
diff --git a/configure.ac b/configure.ac
index 9d942f0..9de79e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,12 +57,6 @@ dnl === Command line options ===
 AC_ARG_WITH(boost-headers,
             [AC_HELP_STRING([--with-boost-headers=dir], [Boost headers 
directory])],
             lmi_boost_headers=$withval)
-AC_ARG_WITH(boost-libs,
-            [AC_HELP_STRING([--with-boost-libs=dir], [Boost libs installation 
directory])],
-            lmi_boost_libs=$withval)
-AC_ARG_WITH(boost-toolkit,
-            [AC_HELP_STRING([--with-boost-toolkit=dir], [Boost installation 
toolkit (gcc, mgw, etc.)])],
-            lmi_boost_toolkit=$withval)
 
 dnl add support for --wxdir, --wx-config, --wx-prefix, ----wx-exec-prefix
 WX_CONFIG_OPTIONS
@@ -414,55 +408,6 @@ AC_CHECK_HEADER([boost/type_traits.hpp],
     [AC_INCLUDES_DEFAULT()]
 )
 
-dnl The default boost library name should be used unless otherwise specified
-dnl via --with-boost-tookit options, in which case we need to add
-dnl toolkit suffix to the library name (example -lboost_regex-gcc-mt).
-if test "x$lmi_boost_toolkit" != "x"; then
-    lmi_boost_toolkit="-$lmi_boost_toolkit"
-fi
-boost_libsystem="boost_system$lmi_boost_toolkit"
-boost_libregex="boost_regex$lmi_boost_toolkit"
-
-save_CPPFLAGS=$CPPFLAGS
-save_LIBS=$LIBS
-save_LDFLAGS=$LDFLAGS
-if test "x$lmi_boost_libs" != "x"; then
-    BOOST_LDFLAGS="$BOOST_LDFLAGS -L$lmi_boost_libs "
-    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-    errmsg="even in $lmi_boost_libs"
-else
-    errmsg="use --with-boost-libs=dir
-if it is installed in non default location"
-fi
-
-dnl latest versions of boost extract some common functionality in
-dnl libboost_system which we must link when using any other Boost library, so
-dnl check for it first
-AC_CHECK_LIB($boost_libsystem,main,BOOST_LIBS="-l$boost_libsystem")
-
-dnl usually when we want to check for a library we use AC_CHECK_LIB and main()
-dnl but since under mingw with -pedantic and -std= options test does not pass
-dnl we are forced to use a bit more sophisticated construct and include our own
-dnl wrapper header which disables various warnings that occur in Boost headers
-
-CPPFLAGS="$save_CPPFLAGS -I$srcdir"
-LIBS="$save_LIBS -l$boost_libregex"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "boost_regex.hpp"]],
-    [[boost::regex *r]])],
-    [],
-    [AC_MSG_FAILURE([Boost regex library $boost_libregex not found, $errmsg])]
-)
-
-LDFLAGS=$save_LDFLAGS
-LIBS=$save_LIBS
-CPPFLAGS=$save_CPPFLAGS
-
-BOOST_LIBS="-l$boost_libregex $BOOST_LIBS"
-
-dnl contains flags needed to link to externally or internally built
-dnl boost libraries
-AC_SUBST(BOOST_LIBS)
-
 dnl check for the other required libraries: under Unix we use pkg-config which
 dnl is easily available for (and often already installed under) any Linux
 dnl system but when using Cygwin we do the checks manually as installing
diff --git a/objects.make b/objects.make
index bd1e741..63a402e 100644
--- a/objects.make
+++ b/objects.make
@@ -25,32 +25,6 @@
 # is reached through 'vpath' directives. See the rationale in
 # 'workhorse.make'.
 
-# Boost regex library. The other boost libraries that lmi optionally
-# uses are implemented entirely in headers.
-#
-# As for listing the object files here, the regex author says:
-#   http://groups.google.com/group/boost-list/msg/7f925ca50d69384b
-# | add the libs/regex/src/*.cpp files to your project
-
-boost_regex_objects := \
-  c_regex_traits.o \
-  cpp_regex_traits.o \
-  cregex.o \
-  fileiter.o \
-  icu.o \
-  instances.o \
-  posix_api.o \
-  regex.o \
-  regex_debug.o \
-  regex_raw_buffer.o \
-  regex_traits_defaults.o \
-  static_mutex.o \
-  usinstances.o \
-  w32_regex_traits.o \
-  wc_regex_traits.o \
-  wide_posix_api.o \
-  winstances.o \
-
 # GNU cgicc.
 
 # TODO ?? Track down the problems in cgicc-3.2.3 that make it
@@ -101,7 +75,6 @@ cgicc_3_1_4_objects = \
 # have them as libraries.
 
 ifdef HAVE_THIRD_PARTY_LIBRARIES
-  boost_regex_objects :=
   cgicc_objects :=
 endif
 
@@ -349,7 +322,6 @@ lmi_wx_objects := \
   main_wx.o \
 
 wx_test_objects := \
-  $(boost_regex_objects) \
   main_wx_test.o \
   wx_test_about_version.o \
   wx_test_benchmark_census.o \
@@ -980,7 +952,6 @@ rate_table_test$(EXEEXT): \
 
 regex_test$(EXEEXT): EXTRA_LDFLAGS = $(pcre_ldflags)
 regex_test$(EXEEXT): \
-  $(boost_regex_objects) \
   $(common_test_objects) \
   regex_test.o \
   timer.o \
@@ -1151,7 +1122,6 @@ test_coding_rules_test := PERFORM=$(PERFORM) 
$(srcdir)/test_coding_rules_test.sh
 test_coding_rules$(EXEEXT): EXTRA_LDFLAGS = $(pcre_ldflags)
 test_coding_rules$(EXEEXT): POST_LINK_COMMAND = $(test_coding_rules_test)
 test_coding_rules$(EXEEXT): \
-  $(boost_regex_objects) \
   $(main_auxiliary_common_objects) \
   miscellany.o \
   my_test_coding_rules.o \
diff --git a/workhorse.make b/workhorse.make
index f6639d6..1ed0d8f 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -351,7 +351,6 @@ sys_include_directories := \
 all_source_directories := \
   $(srcdir) \
   /opt/lmi/third_party/src/boost/libs/filesystem/src \
-  /opt/lmi/third_party/src/boost/libs/regex/src \
   /opt/lmi/third_party/src/cgicc \
 
 vpath lib%.a          $(CURDIR)
@@ -610,36 +609,10 @@ gcc_common_extra_warnings := \
 bourn_cast_test.o: gcc_common_extra_warnings += \
   -Wno-double-promotion \
 
-# Some boost-1.33.1 libraries are incompatible with many warnings.
-
-$(boost_regex_objects): gcc_common_extra_warnings += \
-  -Wno-conversion \
-  -Wno-duplicated-branches \
-  -Wno-implicit-fallthrough \
-  -Wno-old-style-cast \
-  -Wno-register \
-  -Wno-shadow \
-  -Wno-switch-enum \
-  -Wno-unused-macros \
-  -Wno-unused-result \
-  -Wno-useless-cast \
-  -Wno-zero-as-null-pointer-constant \
-
 $(cgicc_objects): gcc_common_extra_warnings += \
   -Wno-conversion \
   -Wno-zero-as-null-pointer-constant \
 
-# The boost regex library improperly defines "NOMINMAX":
-#   http://lists.boost.org/Archives/boost/2006/03/102189.php
-# at least in version 1.33.1, and there seems to be no easy workaround
-# except to blow away all warning options and let a warning appear.
-# This problem seems not to occur with gcc-4.x .
-
-ifeq (3.4.5,$(gcc_version))
-  static_mutex.o: gcc_common_extra_warnings :=
-  static_mutex.o:          gcc_cxx_warnings :=
-endif
-
 ifeq (safestdlib,$(findstring safestdlib,$(build_type)))
   ifeq (3.4.5,$(gcc_version))
     expression_template_0_test.o: gcc_common_extra_warnings += 
-Wno-unused-parameter
@@ -672,7 +645,6 @@ wno_conv_objects := \
 $(wno_conv_objects): gcc_common_extra_warnings += -Wno-conversion 
-Wfloat-conversion
 
 wno_sign_conv_objects := \
-  $(boost_regex_objects) \
   $(wx_dependent_objects) \
   crc32.o \
   getopt.o \