feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Patched up support for the new Borland 6.0 compiler in strict mode.

Browse Source 
[SVN r21035]
This commit is contained in:
John Maddock
2003-12-01 11:52:28 +00:00
parent 1a50827c46
commit ebc12d24c9
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,7 +219,7 @@ namespace boost{ typedef wchar_t regex_wchar_type; }
# define BOOST_REGEX_DECL # define BOOST_REGEX_DECL
#endif #endif
#if (defined(BOOST_MSVC) || defined(__BORLANDC__)) && !defined(BOOST_REGEX_NO_LIB) && !defined(BOOST_REGEX_SOURCE) && !defined(BOOST_ALL_NO_LIB) #if (defined(BOOST_MSVC) || defined(__BORLANDC__)) && !defined(BOOST_REGEX_NO_LIB) && !defined(BOOST_REGEX_SOURCE) && !defined(BOOST_ALL_NO_LIB) && defined(__cplusplus)
# define BOOST_LIB_NAME boost_regex # define BOOST_LIB_NAME boost_regex
# if defined(BOOST_REGEX_DYN_LINK) || defined(BOOST_ALL_DYN_LINK) # if defined(BOOST_REGEX_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)
# define BOOST_DYN_LINK # define BOOST_DYN_LINK
@ -245,7 +245,7 @@ namespace boost{ typedef wchar_t regex_wchar_type; }
# define BOOST_REGEX_CCALL __cdecl # define BOOST_REGEX_CCALL __cdecl
#endif #endif
#if defined(__BORLANDC__) #if defined(__BORLANDC__) && !defined(BOOST_DISABLE_WIN32)
# define BOOST_REGEX_CALL __fastcall # define BOOST_REGEX_CALL __fastcall
# define BOOST_REGEX_CCALL __stdcall # define BOOST_REGEX_CCALL __stdcall
#endif #endif
@ -392,7 +392,7 @@ public:
****************************************************************************/ ****************************************************************************/
#if !defined(BOOST_REGEX_NO_W32) && !defined(BOOST_REGEX_V3) #if !defined(BOOST_REGEX_NO_W32) && !defined(BOOST_REGEX_V3)
# if(defined(_WIN32) || defined(_WIN64) || defined(_WINCE)) && !defined(__GNUC__) # if(defined(_WIN32) || defined(_WIN64) || defined(_WINCE)) && !defined(__GNUC__) && !(__BORLANDC__ >= 0x600)
# define BOOST_REGEX_HAS_MS_STACK_GUARD # define BOOST_REGEX_HAS_MS_STACK_GUARD
# endif # endif
#elif defined(BOOST_REGEX_HAS_MS_STACK_GUARD) #elif defined(BOOST_REGEX_HAS_MS_STACK_GUARD)

8
include/boost/regex/v4/char_regex_traits.hpp
View File

@ -20,8 +20,8 @@
#ifndef BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP #ifndef BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP
#define BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP #define BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP
#ifdef __BORLANDC__ #ifdef BOOST_HAS_ABI_HEADERS
#pragma option push -a8 -b -Vx -Ve -pc -w-8027 # include BOOST_ABI_PREFIX
#endif #endif
namespace boost{ namespace boost{
@ -74,8 +74,8 @@ public:
} // namespace deprecated } // namespace deprecated
} // namespace boost } // namespace boost
#ifdef __BORLANDC__ #ifdef BOOST_HAS_ABI_HEADERS
# pragma option pop # include BOOST_ABI_SUFFIX
#endif #endif
#endif // include #endif // include

2
include/boost/regex/v4/cregex.hpp
View File

@ -189,7 +189,7 @@ struct pred4;
} // namespace re_detail } // namespace re_detail
#if defined(BOOST_MSVC) || defined(__BORLANDC__) #if (defined(BOOST_MSVC) || defined(__BORLANDC__)) && !defined(BOOST_DISABLE_WIN32)
typedef bool (__cdecl *GrepCallback)(const RegEx& expression); typedef bool (__cdecl *GrepCallback)(const RegEx& expression);
typedef bool (__cdecl *GrepFileCallback)(const char* file, const RegEx& expression); typedef bool (__cdecl *GrepFileCallback)(const char* file, const RegEx& expression);
typedef bool (__cdecl *FindFilesCallback)(const char* file); typedef bool (__cdecl *FindFilesCallback)(const char* file);

2
include/boost/regex/v4/instances.hpp
View File

@ -37,7 +37,7 @@ namespace boost{
// what follows is compiler specific: // what follows is compiler specific:
// //
#ifdef __BORLANDC__ #if defined(__BORLANDC__) && (__BORLANDC__ < 0x600)
#ifdef BOOST_HAS_ABI_HEADERS #ifdef BOOST_HAS_ABI_HEADERS
# include BOOST_ABI_PREFIX # include BOOST_ABI_PREFIX