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

This commit is contained in:
jzmaddock
2014-01-26 12:04:07 +00:00
3 changed files with 10 additions and 2 deletions

View File

@ -10,6 +10,14 @@
#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)
# define BOOST_NO_EXCEPTIONS
#endif

View File

@ -86,7 +86,7 @@
# define BOOST_NO_STD_LOCALE
#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
// <exception> header before including the <typeinfo> header. Admittedly
// trying to use Boost libraries or the standard C++ libraries without

View File

@ -19,7 +19,7 @@ struct my_literal
constexpr my_literal() : val(0) {}
constexpr my_literal(int i) : val(i) {}
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;
};