boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-14 21:06:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[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
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/cregex.hpp
View File

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

2
include/boost/regex.hpp
View File

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

2
include/boost/regex/detail/fileiter.hpp
View File

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

4
include/boost/regex/detail/instances.hpp
View File

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

2
include/boost/regex/detail/regex_compile.hpp
View File

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

2
include/boost/regex/detail/regex_cstring.hpp
View File

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

2
include/boost/regex/detail/regex_format.hpp
View File

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

2
include/boost/regex/detail/regex_kmp.hpp
View File

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

2
include/boost/regex/detail/regex_match.hpp
View File

@ -31,7 +31,7 @@ namespace boost{
namespace re_detail{ namespace re_detail{
#ifdef __BORLANDC__ #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 #endif
// //

2
include/boost/regex/detail/regex_raw_buffer.hpp
View File

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

2
include/boost/regex/detail/regex_split.hpp
View File

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

2
include/boost/regex/detail/regex_stack.hpp
View File

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

2
include/boost/regex/detail/regex_synch.hpp
View File

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

2
include/boost/regex/pattern_except.hpp
View File

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

6
include/boost/regex/regex_traits.hpp
View File

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