boostorg/config
1
0
Fork 1
mirror of https://github.com/boostorg/config.git synced 2025-07-31 12:57:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/boostorg/config into develop

Browse Source
This commit is contained in:
jzmaddock
2014-01-26 12:04:07 +00:00
parent 902102ee69 800d3d5416
commit e9ebccdb74
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/config/compiler/clang.hpp
View File

@@ -10,6 +10,14 @@
#define BOOST_HAS_PRAGMA_ONCE #define BOOST_HAS_PRAGMA_ONCE
// When compiling with clang before __has_extension was defined,
// even if one writes 'defined(__has_extension) && __has_extension(xxx)',
// clang reports a compiler error. So the only workaround found is:
#ifndef __has_extension
#define __has_extension __has_feature
#endif
#if !__has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS) #if !__has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS)
# define BOOST_NO_EXCEPTIONS # define BOOST_NO_EXCEPTIONS
#endif #endif

2
include/boost/config/stdlib/dinkumware.hpp
View File

@@ -86,7 +86,7 @@
# define BOOST_NO_STD_LOCALE # define BOOST_NO_STD_LOCALE
#endif #endif
// Fix for VC++ 8.0 on up ( I do not have a previous vesion to test ) // Fix for VC++ 8.0 on up ( I do not have a previous version to test )
// or clang-cl. If exceptions are off you must manually include the // or clang-cl. If exceptions are off you must manually include the
// <exception> header before including the <typeinfo> header. Admittedly // <exception> header before including the <typeinfo> header. Admittedly
// trying to use Boost libraries or the standard C++ libraries without // trying to use Boost libraries or the standard C++ libraries without

2
test/boost_no_cxx11_user_lit.ipp
View File

@@ -19,7 +19,7 @@ struct my_literal
constexpr my_literal() : val(0) {} constexpr my_literal() : val(0) {}
constexpr my_literal(int i) : val(i) {} constexpr my_literal(int i) : val(i) {}
constexpr my_literal(const my_literal& a) : val(a.val) {} constexpr my_literal(const my_literal& a) : val(a.val) {}
constexpr bool operator==(const my_literal& a) { return val == a.val; } constexpr bool operator==(const my_literal& a) const { return val == a.val; }
int val; int val;
}; };