Added fixes for C++ Builder 6 alignment (binary compatibility) issues.

[SVN r14087]

include/boost/cregex.hpp

@@ -27,7 +27,7 @@
 #include <boost/regex/config.hpp>
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
+   #pragma option push -a8 -b -Vx -Ve -pc
 #endif
 
 /* include these defs only for POSIX compatablity */

include/boost/regex.hpp

@@ -54,7 +54,7 @@
 namespace boost{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc -w-8027
+   #pragma option push -a8 -b -Vx -Ve -pc -w-8027
 #endif
 
 namespace re_detail{

include/boost/regex/detail/fileiter.hpp

@@ -81,7 +81,7 @@ namespace boost{
    namespace re_detail{
 
 #ifdef __BORLANDC__
-    #pragma option push -a4 -b -Ve -pc
+   #pragma option push -a8 -b -Vx -Ve -pc
 #endif
 
 struct _fi_find_data

include/boost/regex/detail/instances.hpp

@@ -40,6 +40,8 @@ namespace boost{
 
 #ifdef __BORLANDC__
 
+#pragma option push -a8 -b -Vx -Ve -pc
+
 #  ifndef BOOST_REGEX_INSTANTIATE
 #     pragma option push -Jgx
 #  endif
@@ -55,6 +57,8 @@ template class BOOST_REGEX_DECL match_results<std::basic_string<BOOST_REGEX_CHAR
 #     pragma option pop
 #  endif
 
+#pragma option pop
+
 #elif defined(BOOST_MSVC)
 
 #  ifndef BOOST_REGEX_INSTANTIATE

include/boost/regex/detail/regex_compile.hpp

@@ -26,7 +26,7 @@
 
 namespace boost{
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc -w-8004
+   #pragma option push -a8 -b -Vx -Ve -pc  -w-8004
 #endif
    namespace re_detail{
 

include/boost/regex/detail/regex_cstring.hpp

@@ -35,7 +35,7 @@ namespace boost{
    namespace re_detail{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
+   #pragma option push -a8 -b -Vx -Ve -pc
 #endif
 
 //

include/boost/regex/detail/regex_format.hpp

@@ -40,7 +40,7 @@ enum format_flags_t{
 namespace re_detail{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc -w-8037
+   #pragma option push -a8 -b -Vx -Ve -pc  -w-8037
 #endif
 
 template <class O, class I>

include/boost/regex/detail/regex_kmp.hpp

@@ -34,7 +34,7 @@ namespace boost{
    namespace re_detail{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
+   #pragma option push -a8 -b -Vx -Ve -pc
 #endif
 
 template <class charT>

include/boost/regex/detail/regex_match.hpp

@@ -31,7 +31,7 @@ namespace boost{
    namespace re_detail{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc -w-8026 -w-8027
+   #pragma option push -a8 -b -Vx -Ve -pc  -w-8026 -w-8027
 #endif
 
 //

include/boost/regex/detail/regex_raw_buffer.hpp

@@ -33,7 +33,7 @@ namespace boost{
    namespace re_detail{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
+   #pragma option push -a8 -b -Vx -Ve -pc
 #endif
 
 struct empty_padding{};

include/boost/regex/detail/regex_split.hpp

@@ -28,7 +28,7 @@
 namespace boost{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
+   #pragma option push -a8 -b -Vx -Ve -pc
 #endif
 
 namespace re_detail{

include/boost/regex/detail/regex_stack.hpp

@@ -36,7 +36,7 @@ namespace boost{
    namespace re_detail{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
+   #pragma option push -a8 -b -Vx -Ve -pc
 #endif
 
 //

include/boost/regex/detail/regex_synch.hpp

@@ -47,7 +47,7 @@ namespace boost{
    namespace re_detail{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
+   #pragma option push -a8 -b -Vx -Ve -pc
 #endif
 
 void BOOST_REGEX_CALL re_init_threads();

include/boost/regex/pattern_except.hpp

@@ -28,7 +28,7 @@
 namespace boost{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
+   #pragma option push -a8 -b -Vx -Ve -pc
 #endif
 
 class BOOST_REGEX_DECL bad_pattern : public std::runtime_error

include/boost/regex/regex_traits.hpp

@@ -30,7 +30,7 @@
 namespace boost{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
+   #pragma option push -a8 -b -Vx -Ve -pc
 #endif
 
 template <class charT>
@@ -123,6 +123,10 @@ struct BOOST_REGEX_DECL regex_traits_base
 
       syntax_max = 54
    };
+#ifdef __BORLANDC__
+private:
+   char dummy_member;
+#endif
 };
 
 struct BOOST_REGEX_DECL c_traits_base : public regex_traits_base