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

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

@ -3,12 +3,12 @@
* Copyright (c) 1998-2002 * Copyright (c) 1998-2002
* Dr John Maddock * Dr John Maddock
* *
* Use, modification and distribution are subject to the * Use, modification and distribution are subject to the
* Boost Software License, Version 1.0. (See accompanying file * Boost Software License, Version 1.0. (See accompanying file
* LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
* *
*/ */
/* /*
* LOCATION: see http://www.boost.org for most recent version. * LOCATION: see http://www.boost.org for most recent version.
* FILE config.hpp * FILE config.hpp
@ -218,8 +218,8 @@ namespace boost{ typedef wchar_t regex_wchar_type; }
#ifndef BOOST_REGEX_DECL #ifndef BOOST_REGEX_DECL
# 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)
@ -401,7 +401,7 @@ public:
#if defined(__cplusplus) && defined(BOOST_REGEX_HAS_MS_STACK_GUARD) #if defined(__cplusplus) && defined(BOOST_REGEX_HAS_MS_STACK_GUARD)
namespace boost{ namespace boost{
namespace re_detail{ namespace re_detail{
BOOST_REGEX_DECL void BOOST_REGEX_CALL reset_stack_guard_page(); BOOST_REGEX_DECL void BOOST_REGEX_CALL reset_stack_guard_page();
@ -420,16 +420,16 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL reset_stack_guard_page();
#if defined(__cplusplus) #if defined(__cplusplus)
namespace boost{ namespace boost{
namespace re_detail{ namespace re_detail{
BOOST_REGEX_DECL void BOOST_REGEX_CALL raise_regex_exception(const std::string& s); BOOST_REGEX_DECL void BOOST_REGEX_CALL raise_regex_exception(const std::string& s);
template <class traits> template <class traits>
void raise_error(const traits& t, unsigned code) void raise_error(const traits& t, unsigned code)
{ {
(void)t; // warning suppression (void)t; // warning suppression
raise_regex_exception(t.error_string(code)); raise_regex_exception(t.error_string(code));
} }
} }
@ -584,7 +584,7 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL put_mem_block(void*);
#ifdef BOOST_REGEX_CONFIG_INFO #ifdef BOOST_REGEX_CONFIG_INFO
BOOST_REGEX_DECL void BOOST_REGEX_CALL print_regex_library_info(); BOOST_REGEX_DECL void BOOST_REGEX_CALL print_regex_library_info();
#endif #endif
#if defined(BOOST_REGEX_DIAG) #if defined(BOOST_REGEX_DIAG)
# pragma message ("BOOST_REGEX_DECL set as: " BOOST_STRINGIZE(BOOST_REGEX_DECL)) # pragma message ("BOOST_REGEX_DECL set as: " BOOST_STRINGIZE(BOOST_REGEX_DECL))
# pragma message ("BOOST_REGEX_CALL set as: " BOOST_STRINGIZE(BOOST_REGEX_CALL)) # pragma message ("BOOST_REGEX_CALL set as: " BOOST_STRINGIZE(BOOST_REGEX_CALL))

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

@ -3,8 +3,8 @@
* Copyright (c) 2002 * Copyright (c) 2002
* Dr John Maddock * Dr John Maddock
* *
* Use, modification and distribution are subject to the * Use, modification and distribution are subject to the
* Boost Software License, Version 1.0. (See accompanying file * Boost Software License, Version 1.0. (See accompanying file
* LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
* *
*/ */
@ -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

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

@ -3,12 +3,12 @@
* Copyright (c) 1998-2002 * Copyright (c) 1998-2002
* Dr John Maddock * Dr John Maddock
* *
* Use, modification and distribution are subject to the * Use, modification and distribution are subject to the
* Boost Software License, Version 1.0. (See accompanying file * Boost Software License, Version 1.0. (See accompanying file
* LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
* *
*/ */
/* /*
* LOCATION: see http://www.boost.org for most recent version. * LOCATION: see http://www.boost.org for most recent version.
* FILE cregex.cpp * FILE cregex.cpp
@ -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);

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

@ -3,8 +3,8 @@
* Copyright (c) 1998-2002 * Copyright (c) 1998-2002
* Dr John Maddock * Dr John Maddock
* *
* Use, modification and distribution are subject to the * Use, modification and distribution are subject to the
* Boost Software License, Version 1.0. (See accompanying file * Boost Software License, Version 1.0. (See accompanying file
* LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
* *
*/ */
@ -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
@ -83,7 +83,7 @@ template class BOOST_REGEX_DECL reg_expression< BOOST_REGEX_CHAR_T >;
} // namespace boost } // namespace boost
#endif // BOOST_REGEX_NO_EXTERNAL_TEMPLATES #endif // BOOST_REGEX_NO_EXTERNAL_TEMPLATES