diff DEPENDENCIES/generic/include/boost/log/detail/config.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

--- a/DEPENDENCIES/generic/include/boost/log/detail/config.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/log/detail/config.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -1,5 +1,5 @@
 /*
- *          Copyright Andrey Semashev 2007 - 2013.
+ *          Copyright Andrey Semashev 2007 - 2015.
  * Distributed under the Boost Software License, Version 1.0.
  *    (See accompanying file LICENSE_1_0.txt or copy at
  *          http://www.boost.org/LICENSE_1_0.txt)
@@ -30,6 +30,14 @@
 #   error Boost.Log: RTTI is required by the library
 #endif
 
+#if defined(_MSC_VER) && _MSC_VER >= 1600
+#   define BOOST_LOG_HAS_PRAGMA_DETECT_MISMATCH
+#endif
+
+#if defined(BOOST_LOG_HAS_PRAGMA_DETECT_MISMATCH)
+#include <boost/preprocessor/stringize.hpp>
+#endif
+
 #if !defined(BOOST_WINDOWS)
 #   ifndef BOOST_LOG_WITHOUT_DEBUG_OUTPUT
 #       define BOOST_LOG_WITHOUT_DEBUG_OUTPUT
@@ -140,6 +148,9 @@
 #endif
 #if !defined(BOOST_LOG_UNREACHABLE)
 #   define BOOST_LOG_UNREACHABLE()
+#   define BOOST_LOG_UNREACHABLE_RETURN(r) return r
+#else
+#   define BOOST_LOG_UNREACHABLE_RETURN(r) BOOST_LOG_UNREACHABLE()
 #endif
 
 // Some compilers support a special attribute that shows that a function won't return
@@ -155,15 +166,6 @@
 #   define BOOST_LOG_NORETURN
 #endif
 
-// cxxabi.h availability macro
-#if defined(BOOST_CLANG)
-#   if defined(__has_include) && __has_include(<cxxabi.h>)
-#       define BOOST_LOG_HAS_CXXABI_H
-#   endif
-#elif defined(__GNUC__) && !defined(__QNX__)
-#   define BOOST_LOG_HAS_CXXABI_H
-#endif
-
 #if !defined(BOOST_LOG_BUILDING_THE_LIB)
 
 // Detect if we're dealing with dll
@@ -262,6 +264,11 @@
 #   endif
 #endif // defined(BOOST_LOG_USE_COMPILER_TLS)
 
+#ifndef BOOST_LOG_CPU_CACHE_LINE_SIZE
+//! The macro defines the CPU cache line size for the target architecture. This is mostly used for optimization.
+#define BOOST_LOG_CPU_CACHE_LINE_SIZE 64
+#endif
+
 namespace boost {
 
 // Setup namespace name
@@ -335,6 +342,10 @@
 
 #endif // !defined(BOOST_LOG_DOXYGEN_PASS)
 
+#if defined(BOOST_LOG_HAS_PRAGMA_DETECT_MISMATCH)
+#pragma detect_mismatch("boost_log_abi", BOOST_PP_STRINGIZE(BOOST_LOG_VERSION_NAMESPACE))
+#endif
+
 } // namespace boost
 
 #endif // BOOST_LOG_DETAIL_CONFIG_HPP_INCLUDED_