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

Added missing BOOST_RE_CALL declarators to c_regex_traits

Browse Source 
tweeked BOOST_RE_CALL definition


[SVN r10100]
This commit is contained in:
John Maddock
2001-05-12 10:41:19 +00:00
parent f6fd177e2a
commit a58bf0705d
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/boost/regex/detail/regex_config.hpp
View File

@ -121,8 +121,12 @@ full list of macros and their usage.
#define BOOST_RE_CALL
#define BOOST_RE_CCALL
#else
#define BOOST_RE_CALL __fastcall
#define BOOST_RE_CCALL __stdcall
#ifndef BOOST_RE_CALL
#define BOOST_RE_CALL __fastcall
#endif
#ifndef BOOST_RE_CCALL
#define BOOST_RE_CCALL __stdcall
#endif
#endif
#define BOOST_RE_NO_CAT
@ -160,12 +164,16 @@ full list of macros and their usage.
//
// only want "real" Visual C++ here:
#if defined(BOOST_MSVC) && !defined(__WATCOMC__) && !defined(__BORLANDC__) && !defined(__GNUC__) && !defined(__MWERKS__) && !defined (__ICL)
#ifdef _DEBUG
#define BOOST_RE_CALL __cdecl
#else
#define BOOST_RE_CALL __fastcall
#endif
#define BOOST_RE_CCALL __stdcall
#ifndef BOOST_RE_CALL
#ifdef _DEBUG
#define BOOST_RE_CALL __cdecl
#else
#define BOOST_RE_CALL __fastcall
#endif
#endif
#ifndef BOOST_RE_CCALL
#define BOOST_RE_CCALL __stdcall
#endif
#if BOOST_MSVC < 1100
#define BOOST_RE_NO_NAMESPACES
@ -207,7 +215,7 @@ full list of macros and their usage.
//
// import export options:
#if defined(_DLL) && !defined(BOOST_RE_STATIC_LIB)
#if defined(_DLL) && !defined(BOOST_RE_STATIC_LIB) && !defined(BOOST_RE_NO_LIB)
#ifdef BOOST_RE_BUILD_DLL
#define BOOST_RE_IX_DECL __declspec( dllexport )
#elif !defined(BOOST_REGEX_LIBRARY_INCLUDE_HPP) && !defined(BOOST_RE_NO_LIB)

6
src/c_regex_traits.cpp
View File

@ -403,7 +403,7 @@ namespace re_detail{
char c_traits_base::regex_message_catalogue[200] = {0};
std::string c_traits_base::error_string(unsigned id)
std::string BOOST_RE_CALL c_traits_base::error_string(unsigned id)
{
return re_get_error_str(id);
}
@ -527,7 +527,7 @@ bool BOOST_RE_CALL c_traits_base::do_lookup_collate(std::string& buf, const char
return result;
}
std::string c_traits_base::set_message_catalogue(const std::string& l)
std::string BOOST_RE_CALL c_traits_base::set_message_catalogue(const std::string& l)
{
if(sizeof(regex_message_catalogue) <= l.size())
return l;
@ -571,7 +571,7 @@ bool BOOST_RE_CALL c_regex_traits<wchar_t>::lookup_collatename(std::basic_string
c_regex_traits<char> c_regex_traits<char>::i;
void c_regex_traits<char>::init()
void BOOST_RE_CALL c_regex_traits<char>::init()
{
BOOST_RE_GUARD_STACK
#ifdef BOOST_RE_THREADS