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

Change regex to make use of new Boost.Config macros.

Browse Source 
[SVN r62331]
This commit is contained in:
John Maddock
2010-05-30 17:24:45 +00:00
parent e3dfbd0953
commit 2e41f13526
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,16 +186,19 @@
* *
****************************************************************************/ ****************************************************************************/
#if defined(BOOST_HAS_DECLSPEC) && (defined(BOOST_REGEX_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)) && !defined(BOOST_REGEX_STATIC_LINK) #ifndef BOOST_SYMBOL_EXPORT
# if defined(BOOST_REGEX_SOURCE) # define BOOST_SYMBOL_EXPORT
# define BOOST_REGEX_DECL __declspec(dllexport) # define BOOST_SYMBOL_IMPORT
# define BOOST_REGEX_BUILD_DLL
# else
# define BOOST_REGEX_DECL __declspec(dllimport)
# endif
#endif #endif
#ifndef BOOST_REGEX_DECL #if (defined(BOOST_REGEX_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)) && !defined(BOOST_REGEX_STATIC_LINK)
# if defined(BOOST_REGEX_SOURCE)
# define BOOST_REGEX_DECL BOOST_SYMBOL_EXPORT
# define BOOST_REGEX_BUILD_DLL
# else
# define BOOST_REGEX_DECL BOOST_SYMBOL_IMPORT
# endif
#else
# define BOOST_REGEX_DECL # define BOOST_REGEX_DECL
#endif #endif

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

@ -118,10 +118,14 @@ template class BOOST_REGEX_TEMPLATE_DECL ::boost::re_detail::perl_matcher< std::
#undef BOOST_REGEX_TEMPLATE_DECL #undef BOOST_REGEX_TEMPLATE_DECL
#elif (defined(__GNUC__) && (__GNUC__ >= 3)) #elif (defined(__GNUC__) && (__GNUC__ >= 3)) || !defined(BOOST_NO_EXTERN_TEMPLATE)
# ifndef BOOST_REGEX_INSTANTIATE # ifndef BOOST_REGEX_INSTANTIATE
# define template __extension__ extern template # ifdef __GNUC__
# define template __extension__ extern template
# else
# define template extern template
# endif
# endif # endif
#if !defined(BOOST_NO_STD_LOCALE) && !defined(BOOST_REGEX_ICU_INSTANCES) #if !defined(BOOST_NO_STD_LOCALE) && !defined(BOOST_REGEX_ICU_INSTANCES)

2
test/c_compiler_checks/posix_api_check.c
View File

@ -54,7 +54,7 @@ int main()
regfreeA(&re); regfreeA(&re);
return result; return result;
} }
assert(matches[0].rm_so == matches[0].rm_eo == 1); assert((matches[0].rm_so == matches[0].rm_eo) && (matches[0].rm_eo == 1));
regfreeA(&re); regfreeA(&re);
printf("no errors found\n"); printf("no errors found\n");
return 0; return 0;