boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-16 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
jzmaddock
2019-02-24 09:17:34 +00:00
parent 866d546fd0 fed22db5f9
commit 18e7b8c463
7 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -247,6 +247,8 @@ install:
- git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root - cd boost-root
- git submodule update --init tools/build - git submodule update --init tools/build
- git submodule update --init tools/boost_install
- git submodule update --init libs/headers
- git submodule update --init libs/config - git submodule update --init libs/config
- git submodule update --init libs/core - git submodule update --init libs/core
- git submodule update --init libs/container_hash - git submodule update --init libs/container_hash

13
appveyor.yml
View File

@ -23,13 +23,15 @@ environment:
- ARGS: --toolset=msvc-14.0 address-model=32 - ARGS: --toolset=msvc-14.0 address-model=32
- ARGS: --toolset=msvc-12.0 address-model=64 - ARGS: --toolset=msvc-12.0 address-model=64
- ARGS: --toolset=msvc-14.0 address-model=64 - ARGS: --toolset=msvc-14.0 address-model=64
- ARGS: --toolset=msvc-14.0 address-model=64 cxxflags=-std:c++latest - ARGS: --toolset=msvc-14.0 address-model=64 cxxstd=latest
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=msvc-14.1 address-model=64 ARGS: --toolset=msvc-14.1 address-model=64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=msvc-14.1 address-model=32 ARGS: --toolset=msvc-14.1 address-model=32
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=msvc-14.1 address-model=64 cxxflags=-std:c++latest ARGS: --toolset=msvc-14.1 address-model=64 cxxstd=17
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=msvc-14.1 address-model=64 cxxstd=latest cxxflags=-permissive-
- ARGS: --toolset=gcc address-model=64 - ARGS: --toolset=gcc address-model=64
PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH% PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
- ARGS: --toolset=gcc address-model=64 cxxflags=-std=gnu++1z - ARGS: --toolset=gcc address-model=64 cxxflags=-std=gnu++1z
@ -38,13 +40,18 @@ environment:
PATH: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;%PATH% PATH: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;%PATH%
- ARGS: --toolset=gcc address-model=32 linkflags=-Wl,-allow-multiple-definition - ARGS: --toolset=gcc address-model=32 linkflags=-Wl,-allow-multiple-definition
PATH: C:\MinGW\bin;%PATH% PATH: C:\MinGW\bin;%PATH%
- ARGS: --toolset=gcc address-model=32 define=_POSIX_C_SOURCE=200112L threadapi=pthread link=static
PATH: C:\cygwin\bin;%PATH%
- ARGS: --toolset=gcc address-model=64 define=_POSIX_C_SOURCE=200112L define=__USE_ISOC99 threadapi=pthread link=static
PATH: C:\cygwin64\bin;%PATH%
install: install:
- cd .. - cd ..
- git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root - git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root - cd boost-root
- git submodule update --init tools/build - git submodule update --init tools/build
- git submodule update --init tools/boost_install
- git submodule update --init libs/headers
- git submodule update --init libs/config - git submodule update --init libs/config
- git submodule update --init libs/core - git submodule update --init libs/core
- git submodule update --init libs/container_hash - git submodule update --init libs/container_hash

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

@ -120,6 +120,10 @@
#ifdef __clang__ #ifdef __clang__
# define BOOST_REGEX_NO_EXTERNAL_TEMPLATES # define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
#endif #endif
#ifdef __CYGWIN__
/* We get multiply defined symbols without this: */
# define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
#endif
/* /*
* If there isn't good enough wide character support then there will * If there isn't good enough wide character support then there will

4
src/regex.cpp
View File

@ -28,7 +28,9 @@
# include <malloc.h> # include <malloc.h>
#endif #endif
#ifdef BOOST_REGEX_HAS_MS_STACK_GUARD #ifdef BOOST_REGEX_HAS_MS_STACK_GUARD
#define WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#ifndef NOMINMAX #ifndef NOMINMAX
# define NOMINMAX # define NOMINMAX
#endif #endif

4
src/static_mutex.cpp
View File

@ -28,7 +28,9 @@
#ifndef NOMINMAX #ifndef NOMINMAX
# define NOMINMAX # define NOMINMAX
#endif #endif
#define WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h> #include <windows.h>
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
#endif #endif

4
src/w32_regex_traits.cpp
View File

@ -23,7 +23,9 @@
#include <boost/regex/regex_traits.hpp> #include <boost/regex/regex_traits.hpp>
#include <boost/regex/pattern_except.hpp> #include <boost/regex/pattern_except.hpp>
#define WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#ifndef NOMINMAX #ifndef NOMINMAX
# define NOMINMAX # define NOMINMAX
#endif #endif

2
test/Jamfile.v2
View File

@ -19,7 +19,7 @@ project
<define>U_USING_ICU_NAMESPACE=0 <define>U_USING_ICU_NAMESPACE=0
#<toolset>gcc-mw:<link>static #<toolset>gcc-mw:<link>static
#<toolset>gcc-mingw:<link>static #<toolset>gcc-mingw:<link>static
<toolset>gcc-cygwin:<link>static #<toolset>gcc-cygwin:<link>static
<toolset>sun:<link>static <toolset>sun:<link>static
; ;