Moved some config code into boost.config (ABI and lib selection code).

[SVN r19546]
2025-07-18 06:42:08 +02:00 · 2003-08-12 11:23:02 +00:00
parent ae95ac6ad0
commit e4248fcb19
33 changed files with 276 additions and 185 deletions
--- a/include/boost/regex/v4/basic_regex.hpp
+++ b/include/boost/regex/v4/basic_regex.hpp
@ -24,8 +24,8 @@
 #ifndef BOOST_REGEX_V4_BASIC_REGEX_HPP
 #define BOOST_REGEX_V4_BASIC_REGEX_HPP

-#ifdef __BORLANDC__
-#  pragma option push -a8 -b -Vx -Ve -pc -w-8027
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 namespace boost{
@ -388,8 +388,8 @@ public:

 } // namespace boost

-#ifdef __BORLANDC__
-#  pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 #endif
--- a/include/boost/regex/v4/cregex.hpp
+++ b/include/boost/regex/v4/cregex.hpp
@ -29,8 +29,8 @@
 #endif
 #include <boost/regex/v4/match_flags.hpp>

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 /* include these defs only for POSIX compatablity */
@ -160,20 +160,15 @@ typedef enum
  REG_E_UNKNOWN = 18 /* unknown error */
 } reg_errcode_t;

+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif

 #ifdef __cplusplus
 } // extern "C"
 } // namespace
 #endif

-
-#ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
-  #pragma option pop
- #endif
-#endif
-
-
 //
 // C++ high level wrapper goes here:
 //
@ -182,12 +177,8 @@ typedef enum
 #include <vector>
 namespace boost{

-#ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b
-   #endif
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 class RegEx;
@ -273,8 +264,8 @@ public:
   friend struct re_detail::pred4;
 };

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace boost
--- a/include/boost/regex/v4/fileiter.hpp
+++ b/include/boost/regex/v4/fileiter.hpp
@ -82,8 +82,8 @@ using std::list;
 namespace boost{
   namespace re_detail{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 struct _fi_find_data
@ -102,12 +102,6 @@ _fi_find_handle _fi_FindFirstFile(const char* lpFileName, _fi_find_data* lpFindF
 bool _fi_FindNextFile(_fi_find_handle hFindFile,   _fi_find_data* lpFindFileData);
 bool _fi_FindClose(_fi_find_handle hFindFile);

-#ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
-  #pragma option pop
- #endif
-#endif
-
   } // namespace re_detail
 } // namespace boost

@ -130,14 +124,6 @@ bool _fi_FindClose(_fi_find_handle hFindFile);
 namespace boost{
   namespace re_detail{

-#ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b
-   #endif
-#endif
-
 #ifdef BOOST_REGEX_FI_WIN32_MAP // win32 mapfile

 class BOOST_REGEX_DECL mapfile
@ -424,8 +410,8 @@ inline bool operator < (const directory_iterator&, const directory_iterator&)
   return false;
 }

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif


--- a/include/boost/regex/v4/instances.hpp
+++ b/include/boost/regex/v4/instances.hpp
@ -43,7 +43,9 @@ namespace boost{

 #ifdef __BORLANDC__

-#pragma option push -a8 -b -Vx -Ve -pc
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif

 #  ifndef BOOST_REGEX_INSTANTIATE
 #     pragma option push -Jgx
@ -55,7 +57,9 @@ template class BOOST_REGEX_DECL reg_expression< BOOST_REGEX_CHAR_T >;
 #     pragma option pop
 #  endif

-#pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif

 #elif defined(BOOST_MSVC) || defined(__GNUC__)

--- a/include/boost/regex/v4/iterator_traits.hpp
+++ b/include/boost/regex/v4/iterator_traits.hpp
@ -23,8 +23,8 @@
 #ifndef BOOST_REGEX_V4_ITERATOR_TRAITS_HPP
 #define BOOST_REGEX_V4_ITERATOR_TRAITS_HPP

-#ifdef __BORLANDC__
-#  pragma option push -a8 -b -Vx -Ve -pc -w-8027
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 namespace boost{
@ -99,8 +99,8 @@ struct regex_iterator_traits : public std::iterator_traits<T> {};
 } // namespace re_detail
 } // namespace boost

-#ifdef __BORLANDC__
-#  pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 #endif
--- a/include/boost/regex/v4/match_results.hpp
+++ b/include/boost/regex/v4/match_results.hpp
@ -23,8 +23,8 @@
 #ifndef BOOST_REGEX_V4_MATCH_RESULTS_HPP
 #define BOOST_REGEX_V4_MATCH_RESULTS_HPP

-#ifdef __BORLANDC__
-#  pragma option push -a8 -b -Vx -Ve -pc -w-8027
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 namespace boost{
@ -313,8 +313,8 @@ std::ostream& operator << (std::ostream& os,

 } // namespace boost

-#ifdef __BORLANDC__
-#  pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 #endif
--- a/include/boost/regex/v4/mem_block_cache.hpp
+++ b/include/boost/regex/v4/mem_block_cache.hpp
@ -25,8 +25,8 @@
 #include <new>
 #include <boost/regex/v4/regex_synch.hpp>

-#ifdef __BORLANDC__
-#  pragma option push -a8 -b -Vx -Ve -pc -w-8027
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 namespace boost{
@ -90,8 +90,8 @@ extern mem_block_cache block_cache;
 }
 } // namespace boost

-#ifdef __BORLANDC__
-#  pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 #endif
--- a/include/boost/regex/v4/perl_matcher.hpp
+++ b/include/boost/regex/v4/perl_matcher.hpp
@ -19,8 +19,8 @@
 #include <boost/regex/v4/iterator_category.hpp>
 #include <boost/scoped_ptr.hpp>

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc  -w-8026 -w-8027
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 namespace boost{
@ -426,6 +426,10 @@ private:

 } // namespace re_detail

+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif
+
 } // namespace boost

 //
@ -439,8 +443,4 @@ private:
 // this one has to be last:
 #include <boost/regex/v4/perl_matcher_common.hpp>

-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
 #endif
--- a/include/boost/regex/v4/perl_matcher_common.hpp
+++ b/include/boost/regex/v4/perl_matcher_common.hpp
@ -24,8 +24,12 @@
 #ifndef BOOST_REGEX_V4_PERL_MATCHER_COMMON_HPP
 #define BOOST_REGEX_V4_PERL_MATCHER_COMMON_HPP

+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+
 #ifdef __BORLANDC__
-#  pragma option push -a8 -b -Vx -Ve -pc -w-8027 -w-8066 -w-8008
+#  pragma option push -w-8008 -w-8066
 #endif

 namespace boost{
@ -789,5 +793,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_lit
 #ifdef __BORLANDC__
 #  pragma option pop
 #endif
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif

 #endif
--- a/include/boost/regex/v4/perl_matcher_non_recursive.hpp
+++ b/include/boost/regex/v4/perl_matcher_non_recursive.hpp
@ -26,8 +26,11 @@

 #include <new>

+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
 #ifdef __BORLANDC__
-#  pragma option push -a8 -b -Vx -Ve -pc -w-8027 -w-8066 -w-8008
+#pragma option push -w-8008 -w-8066 -w-8004
 #endif

 namespace boost{
@ -1156,7 +1159,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_long_set_
   saved_single_repeat<BidiIterator>* pmp = static_cast<saved_single_repeat<BidiIterator>*>(m_backup_state);

   // if we have a match, just discard this state:
-   if(r) 
+   if(r)
   {
      destroy_single_repeat();
      return true;
@ -1194,7 +1197,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_long_set_
   }   
   if(position == last)
   {
-      // can't repeat any more, remove the pushed state: 
+      // can't repeat any more, remove the pushed state:
      destroy_single_repeat();
      if(rep->can_be_null & mask_skip)
         return true;
@ -1234,7 +1237,10 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_non_greed
 } // namespace boost

 #ifdef __BORLANDC__
-#  pragma option pop
+#pragma option pop
+#endif
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 #endif
--- a/include/boost/regex/v4/perl_matcher_recursive.hpp
+++ b/include/boost/regex/v4/perl_matcher_recursive.hpp
@ -24,8 +24,11 @@
 #ifndef BOOST_REGEX_V4_PERL_MATCHER_RECURSIVE_HPP
 #define BOOST_REGEX_V4_PERL_MATCHER_RECURSIVE_HPP

+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
 #ifdef __BORLANDC__
-#  pragma option push -a8 -b -Vx -Ve -pc -w-8027 -w-8066 -w-8008
+#pragma option push -w-8008 -w-8066 -w-8004
 #endif

 namespace boost{
@ -683,9 +686,11 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::backtrack_till_m
 } // namespace re_detail
 } // namespace boost

-
 #ifdef __BORLANDC__
-#  pragma option pop
+#pragma option pop
+#endif
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 #endif
--- a/include/boost/regex/v4/regbase.hpp
+++ b/include/boost/regex/v4/regbase.hpp
@ -23,8 +23,8 @@
 #ifndef BOOST_REGEX_V4_REGBASE_HPP
 #define BOOST_REGEX_V4_REGBASE_HPP

-#ifdef __BORLANDC__
-#  pragma option push -a8 -b -Vx -Ve -pc -w-8027
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 namespace boost{
@ -145,8 +145,8 @@ namespace regex_constants{

 } // namespace boost

-#ifdef __BORLANDC__
-#  pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 #endif
--- a/include/boost/regex/v4/regex_compile.hpp
+++ b/include/boost/regex/v4/regex_compile.hpp
@ -25,10 +25,14 @@
 #define BOOST_REGEX_COMPILE_HPP

 namespace boost{
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc  -w-8004
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif
-   namespace re_detail{
+#ifdef __BORLANDC__
+#pragma option push -w-8004
+#endif
+
+namespace re_detail{


 template <class traits>
@ -2160,9 +2164,11 @@ void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::fail(unsigned in
      _flags &= ~regex_constants::failbit;
 }

-
 #ifdef __BORLANDC__
-  #pragma option pop
+#pragma option pop
+#endif
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace boost
--- a/include/boost/regex/v4/regex_cstring.hpp
+++ b/include/boost/regex/v4/regex_cstring.hpp
@ -34,10 +34,6 @@
 namespace boost{
   namespace re_detail{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
-#endif
-
 //
 // start by defining some template function aliases for C API functions:
 //
@ -119,10 +115,6 @@ inline void BOOST_REGEX_CALL re_strfree(charT* p)
   delete[] p;
 }

-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
 } // namespace re_detail
 } // namespace boost

--- a/include/boost/regex/v4/regex_format.hpp
+++ b/include/boost/regex/v4/regex_format.hpp
@ -28,8 +28,8 @@

 namespace boost{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc  -w-8037
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 //
@ -143,6 +143,9 @@ OutputIterator BOOST_REGEX_CALL _reg_format_aux(OutputIterator out,
                          const charT*& fmt,
                          match_flag_type flags, const traits_type& traits_inst)
 {
+#ifdef __BORLANDC__
+#pragma option push -w-8037
+#endif
   const charT* fmt_end = fmt;
   while(*fmt_end) ++ fmt_end;

@ -424,6 +427,9 @@ default_opt:
   }

   return out;
+#ifdef __BORLANDC__
+#pragma option pop
+#endif
 }

 #if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
@ -520,8 +526,8 @@ std::basic_string<charT> regex_format(const match_results<Iterator, Allocator>&
   return result;
 }

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace boost
--- a/include/boost/regex/v4/regex_grep.hpp
+++ b/include/boost/regex/v4/regex_grep.hpp
@ -26,11 +26,10 @@

 namespace boost{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc  -w-8037
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

-
 //
 // regex_grep:
 // find all non-overlapping matches within the sequence first last:
@ -138,8 +137,8 @@ inline unsigned int regex_grep(bool (*foo)(const match_results<std::basic_string
 #endif
 #endif

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace boost
--- a/include/boost/regex/v4/regex_iterator.hpp
+++ b/include/boost/regex/v4/regex_iterator.hpp
@ -27,6 +27,10 @@

 namespace boost{

+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+
 template <class BidirectionalIterator, 
          class charT,
          class traits,
@ -148,6 +152,9 @@ private:
   }
 };

+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif

 } // namespace boost

--- a/include/boost/regex/v4/regex_kmp.hpp
+++ b/include/boost/regex/v4/regex_kmp.hpp
@ -33,8 +33,8 @@
 namespace boost{
   namespace re_detail{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 template <class charT>
@ -98,8 +98,8 @@ kmp_info<charT>* kmp_compile(iterator first, iterator last, charT, Trans transla
   return pinfo;
 }

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

   } // namepsace re_detail
--- a/include/boost/regex/v4/regex_match.hpp
+++ b/include/boost/regex/v4/regex_match.hpp
@ -36,8 +36,8 @@

 namespace boost{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc  -w-8026 -w-8027
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 //
@ -169,8 +169,8 @@ inline bool regex_match(const std::basic_string<wchar_t>& s,
 #endif


-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace boost
--- a/include/boost/regex/v4/regex_merge.hpp
+++ b/include/boost/regex/v4/regex_merge.hpp
@ -28,8 +28,8 @@

 namespace boost{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc  -w-8037
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 template <class OutputIterator, class Iterator, class traits, class Allocator, class charT>
@ -72,8 +72,8 @@ inline std::basic_string<charT> regex_merge(const std::basic_string<charT>& s,
   return regex_replace(s, e, fmt, flags);
 }

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace boost
--- a/include/boost/regex/v4/regex_raw_buffer.hpp
+++ b/include/boost/regex/v4/regex_raw_buffer.hpp
@ -32,8 +32,8 @@
 namespace boost{
   namespace re_detail{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 struct empty_padding{};
@ -241,8 +241,8 @@ void* BOOST_REGEX_CALL raw_storage<Allocator>::insert(size_type pos, size_type n
   return result;
 }

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace re_detail
--- a/include/boost/regex/v4/regex_replace.hpp
+++ b/include/boost/regex/v4/regex_replace.hpp
@ -28,8 +28,8 @@

 namespace boost{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc  -w-8037
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 template <class OutputIterator, class Iterator, class traits, class Allocator, class charT>
@ -81,8 +81,8 @@ std::basic_string<charT> regex_replace(const std::basic_string<charT>& s,
   return result;
 }

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace boost
--- a/include/boost/regex/v4/regex_search.hpp
+++ b/include/boost/regex/v4/regex_search.hpp
@ -26,8 +26,8 @@

 namespace boost{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc  -w-8037
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 template <class BidiIterator, class Allocator, class charT, class traits, class Allocator2>
@ -187,8 +187,8 @@ inline bool regex_search(const std::basic_string<wchar_t>& s,

 #endif

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace boost
--- a/include/boost/regex/v4/regex_split.hpp
+++ b/include/boost/regex/v4/regex_split.hpp
@ -27,8 +27,8 @@

 namespace boost{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 namespace re_detail{
@ -142,8 +142,8 @@ inline std::size_t regex_split(OutputIterator out,
   return regex_split(out, s, re_detail::get_default_expression(charT(0)), match_default, UINT_MAX);
 }

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace boost
--- a/include/boost/regex/v4/regex_stack.hpp
+++ b/include/boost/regex/v4/regex_stack.hpp
@ -35,8 +35,8 @@
 namespace boost{
   namespace re_detail{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 //
@ -60,7 +60,7 @@ private:
      T* end;    // last item
      T* last;   // end of storage
   };
-   
+
   //
   // empty base member optimisation:
   struct data : public allocator_type
@ -208,8 +208,8 @@ jstack<T, Allocator>::~jstack()
   }
 }

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace re_detail
--- a/include/boost/regex/v4/regex_synch.hpp
+++ b/include/boost/regex/v4/regex_synch.hpp
@ -46,8 +46,8 @@
 namespace boost{
   namespace re_detail{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 void BOOST_REGEX_CALL re_init_threads();
@ -197,8 +197,8 @@ BOOST_REGEX_DECL extern unsigned int re_lock_count;

 #endif // BOOST_HAS_THREADS

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace re_detail
--- a/include/boost/regex/v4/regex_token_iterator.hpp
+++ b/include/boost/regex/v4/regex_token_iterator.hpp
@ -40,6 +40,14 @@

 namespace boost{

+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1300)
+#  pragma warning(push)
+#  pragma warning(disable:4700)
+#endif
+
 template <class BidirectionalIterator,
          class charT,
          class traits,
@ -129,7 +137,7 @@ public:
      }
      if(what.prefix().first != what[0].second)
         flags |= match_prev_avail;
-      BidirectionalIterator last_end = what[0].second;
+      BidirectionalIterator last_end(what[0].second);
      if(regex_search(last_end, end, what, *pre, ((what[0].first == what[0].second) ? flags | regex_constants::match_not_initial_null : flags)))
      {
         N =0;
@ -248,6 +256,12 @@ private:
   }
 };

+#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+#  pragma warning(pop)
+#endif
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif

 } // namespace boost

--- a/include/boost/regex/v4/regex_traits.hpp
+++ b/include/boost/regex/v4/regex_traits.hpp
@ -32,8 +32,8 @@

 namespace boost{

-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 template <class charT>
@ -543,18 +543,6 @@ private:

 #if !defined(BOOST_NO_STD_LOCALE)

-} // namspace boost
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-#include <locale>
-#ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
-#endif
-
-namespace boost{
-
 namespace re_detail
 {

@ -806,8 +794,8 @@ class regex_traits : public cpp_regex_traits<charT>
 #error No default localisation model defined
 #endif

-#ifdef __BORLANDC__
-  #pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 } // namespace boost
--- a/include/boost/regex/v4/states.hpp
+++ b/include/boost/regex/v4/states.hpp
@ -23,8 +23,8 @@
 #ifndef BOOST_REGEX_V4_STATES_HPP
 #define BOOST_REGEX_V4_STATES_HPP

-#ifdef __BORLANDC__
-#  pragma option push -a8 -b -Vx -Ve -pc -w-8027
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 namespace boost{
@ -226,8 +226,8 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,

 } // namespace boost

-#ifdef __BORLANDC__
-#  pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 #endif
--- a/include/boost/regex/v4/sub_match.hpp
+++ b/include/boost/regex/v4/sub_match.hpp
@ -23,8 +23,8 @@
 #ifndef BOOST_REGEX_V4_SUB_MATCH_HPP
 #define BOOST_REGEX_V4_SUB_MATCH_HPP

-#ifdef __BORLANDC__
-#  pragma option push -a8 -b -Vx -Ve -pc -w-8027
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif

 namespace boost{
@ -330,8 +330,8 @@ sub_match<BidiIterator>::operator unsigned int()const

 } // namespace boost

-#ifdef __BORLANDC__
-#  pragma option pop
+#ifdef BOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif

 #endif