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

Update Boost headers (1.58.0)
author Chris Cannam
date Mon, 07 Sep 2015 11:12:49 +0100
parents 2665513ce2d3
children
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/chrono/config.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/chrono/config.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -2,6 +2,7 @@
 
 //  Copyright Beman Dawes 2003, 2006, 2008
 //  Copyright 2009-2011 Vicente J. Botet Escriba
+//  Copyright (c) Microsoft Corporation 2014
 
 //  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)
@@ -12,6 +13,7 @@
 #define BOOST_CHRONO_CONFIG_HPP
 
 #include <boost/config.hpp>
+#include <boost/predef.h>
 
 #if !defined BOOST_CHRONO_VERSION
 #define BOOST_CHRONO_VERSION 1
@@ -64,13 +66,16 @@
 #     define BOOST_CHRONO_HAS_PROCESS_CLOCKS
 #   endif
 #   define BOOST_CHRONO_HAS_CLOCK_STEADY
-#   define BOOST_CHRONO_HAS_THREAD_CLOCK
+#   if BOOST_PLAT_WINDOWS_DESKTOP
+#     define BOOST_CHRONO_HAS_THREAD_CLOCK
+#   endif
 #   define BOOST_CHRONO_THREAD_CLOCK_IS_STEADY true
 # endif
 
 # if defined( BOOST_CHRONO_MAC_API )
 #   define BOOST_CHRONO_HAS_PROCESS_CLOCKS
 #   define BOOST_CHRONO_HAS_CLOCK_STEADY
+#   define BOOST_CHRONO_HAS_THREAD_CLOCK
 #   define BOOST_CHRONO_THREAD_CLOCK_IS_STEADY true
 # endif
 
@@ -92,7 +97,7 @@
 #     undef BOOST_CHRONO_HAS_THREAD_CLOCK
 #     undef BOOST_CHRONO_THREAD_CLOCK_IS_STEADY
 #   endif
-#   if defined(__HP_aCC) && defined(__hpux)
+#   if (defined(__HP_aCC) || defined(__GNUC__)) && defined(__hpux)
 #     undef BOOST_CHRONO_HAS_THREAD_CLOCK
 #     undef BOOST_CHRONO_THREAD_CLOCK_IS_STEADY
 #   endif
@@ -106,8 +111,6 @@
 #undef BOOST_CHRONO_THREAD_CLOCK_IS_STEADY
 #endif
 
-//#undef BOOST_CHRONO_HAS_PROCESS_CLOCKS
-
 // unicode support  ------------------------------//
 
 #if defined(BOOST_NO_CXX11_UNICODE_LITERALS) || defined(BOOST_NO_CXX11_CHAR16_T) || defined(BOOST_NO_CXX11_CHAR32_T)
@@ -116,14 +119,7 @@
 #define BOOST_CHRONO_HAS_UNICODE_SUPPORT 1
 #endif
 
-#if ! defined BOOST_NOEXCEPT
-#if defined(BOOST_NO_CXX11_NOEXCEPT)
-#define BOOST_NOEXCEPT
-#else
-#define BOOST_NOEXCEPT noexcept
-#endif
-#endif
-
+#ifndef BOOST_CHRONO_LIB_CONSTEXPR
 #if defined( BOOST_NO_CXX11_NUMERIC_LIMITS )
 #define BOOST_CHRONO_LIB_CONSTEXPR
 #elif defined(_LIBCPP_VERSION) &&  !defined(_LIBCPP_CONSTEXPR)
@@ -131,6 +127,7 @@
 #else
   #define BOOST_CHRONO_LIB_CONSTEXPR BOOST_CONSTEXPR
 #endif
+#endif
 
 #if defined( BOOST_NO_CXX11_NUMERIC_LIMITS )
 #  define BOOST_CHRONO_LIB_NOEXCEPT_OR_THROW throw()
@@ -142,7 +139,6 @@
 #endif
 #endif
 
-
 #if defined BOOST_CHRONO_PROVIDE_HYBRID_ERROR_HANDLING \
  && defined BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
 #error "BOOST_CHRONO_PROVIDE_HYBRID_ERROR_HANDLING && BOOST_CHRONO_PROVIDE_HYBRID_ERROR_HANDLING defined"