Skip to content

Commit aee67c2

Browse files
committed
re-enable libstdc++ 4.8
- in context of #152
1 parent 56647d5 commit aee67c2

File tree

3 files changed

+29
-66
lines changed

3 files changed

+29
-66
lines changed

build/Jamfile.v2

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ lib boost_fiber
7070
cxx11_defaulted_functions
7171
cxx11_final
7272
cxx11_hdr_mutex
73-
cxx11_hdr_regex
7473
cxx11_hdr_tuple
7574
cxx11_lambdas
7675
cxx11_noexcept
@@ -137,7 +136,6 @@ lib boost_fiber_numa
137136
cxx11_defaulted_functions
138137
cxx11_final
139138
cxx11_hdr_mutex
140-
cxx11_hdr_regex
141139
cxx11_hdr_tuple
142140
cxx11_lambdas
143141
cxx11_noexcept

src/numa/linux/topology.cpp

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,14 @@
2020
#include <boost/filesystem/fstream.hpp>
2121
#include <boost/format.hpp>
2222

23+
#include "boost/fiber/exceptions.hpp"
24+
2325
#ifdef BOOST_HAS_ABI_HEADERS
2426
# include BOOST_ABI_PREFIX
2527
#endif
2628

29+
#if !defined(BOOST_NO_CXX11_HDR_REGEX)
30+
2731
namespace al = boost::algorithm;
2832
namespace fs = boost::filesystem;
2933

@@ -196,6 +200,31 @@ std::vector< node > topology() {
196200

197201
}}}
198202

203+
#else
204+
205+
namespace boost {
206+
namespace fibers {
207+
namespace numa {
208+
209+
#if BOOST_COMP_CLANG || \
210+
BOOST_COMP_GNUC || \
211+
BOOST_COMP_INTEL || \
212+
BOOST_COMP_MSVC
213+
# pragma message "topology() not supported without <regex>"
214+
#endif
215+
216+
BOOST_FIBERS_DECL
217+
std::vector< node > topology() {
218+
throw fiber_error{
219+
std::make_error_code( std::errc::function_not_supported),
220+
"boost fiber: topology() not supported without <regex>" };
221+
return std::vector< node >{};
222+
}
223+
224+
}}}
225+
226+
#endif
227+
199228
#ifdef BOOST_HAS_ABI_HEADERS
200229
# include BOOST_ABI_SUFFIX
201230
#endif

0 commit comments

Comments
 (0)