Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/interprocess/sync/spin/wait.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/interprocess/sync/spin/wait.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/interprocess/sync/spin/wait.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -15,7 +15,11 @@ #ifndef BOOST_INTERPROCESS_SYNC_WAIT_HPP_INCLUDED #define BOOST_INTERPROCESS_SYNC_WAIT_HPP_INCLUDED -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#ifndef BOOST_CONFIG_HPP +# include <boost/config.hpp> +#endif +# +#if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif @@ -30,14 +34,14 @@ // BOOST_INTERPROCESS_SMT_PAUSE -#if defined(_MSC_VER) && _MSC_VER >= 1310 && ( defined(_M_IX86) || defined(_M_X64) ) +#if defined(_MSC_VER) && ( defined(_M_IX86) || defined(_M_X64) ) extern "C" void _mm_pause(); #pragma intrinsic( _mm_pause ) #define BOOST_INTERPROCESS_SMT_PAUSE _mm_pause(); -#elif defined(__GNUC__) && ( defined(__i386__) || defined(__x86_64__) ) +#elif defined(__GNUC__) && ( defined(__i386__) || defined(__x86_64__) ) && !defined(_CRAYC) #define BOOST_INTERPROCESS_SMT_PAUSE __asm__ __volatile__( "rep; nop" : : : "memory" );