feedc0de/boost_static_string
1
0
Fork 0
forked from boostorg/static_string
Code Pull Requests Activity

Rearrange macros so library macros are visible

Browse Source
This commit is contained in:
Krystian Stasiowski
2020-02-01 23:42:58 -05:00
parent 24c7f1e027
commit 00d6d174fb
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/boost/static_string/config.hpp
View File

@ -131,8 +131,20 @@
#endif #endif
#endif #endif
#ifndef BOOST_STATIC_STRING_STANDALONE
#include <boost/assert.hpp>
#include <boost/container_hash/hash.hpp>
#include <boost/static_assert.hpp>
#include <boost/utility/string_view.hpp>
#include <boost/throw_exception.hpp>
#else
#include <cassert>
#include <stdexcept>
#include <string_view>
#endif
// Compiler bug prevents constexpr from working with clang 4.x and 5.x // Compiler bug prevents constexpr from working with clang 4.x and 5.x
// if it is detected, we disable constexpr // if it is detected, we disable constexpr.
#if (BOOST_STATIC_STRING_STANDARD_VERSION >= 201402L && \ #if (BOOST_STATIC_STRING_STANDARD_VERSION >= 201402L && \
BOOST_STATIC_STRING_STANDARD_VERSION < 201703L) && \ BOOST_STATIC_STRING_STANDARD_VERSION < 201703L) && \
defined(__clang__) && \ defined(__clang__) && \
@ -150,23 +162,11 @@ defined(__clang__) && \
// that cannot use the library comparison function // that cannot use the library comparison function
// objects at all in constant expresssions. In these // objects at all in constant expresssions. In these
// cases, we use whatever will make more constexpr work. // cases, we use whatever will make more constexpr work.
#if (defined(__clang__) && defined(__GLIBCXX__) && \ #if defined(__clang__) && defined(__GLIBCXX__) && \
((__GLIBCXX__ > 20181206) && (__GLIBCXX__ < 20190812))) ((__GLIBCXX__ > 20181206) && (__GLIBCXX__ < 20190812))
#define BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS #define BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS
#endif #endif
#ifndef BOOST_STATIC_STRING_STANDALONE
#include <boost/assert.hpp>
#include <boost/container_hash/hash.hpp>
#include <boost/static_assert.hpp>
#include <boost/utility/string_view.hpp>
#include <boost/throw_exception.hpp>
#else
#include <cassert>
#include <stdexcept>
#include <string_view>
#endif
namespace boost { namespace boost {
namespace static_string { namespace static_string {