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

[SVN r14087]
This commit is contained in:
John Maddock
2002-06-06 11:32:45 +00:00
parent 998f94ffe9
commit 293b945785
15 changed files with 22 additions and 14 deletions

View File

@ -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

View File

@ -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

View File

@ -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{

View File

@ -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
//

View File

@ -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>

View File

@ -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>

View File

@ -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
//

View File

@ -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{};

View File

@ -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{

View File

@ -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
//

View File

@ -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();

View File

@ -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

View File

@ -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