feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

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

Browse Source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
jzmaddock
2017-03-13 18:07:03 +00:00
parent 62921ff58a
commit 86d6607582
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/config/compiler/xlcpp_zos.hpp
View File

@ -156,7 +156,7 @@
#if defined(__IBM_ATTRIBUTES) #if defined(__IBM_ATTRIBUTES)
# define BOOST_FORCEINLINE inline __attribute__ ((__always_inline__)) # define BOOST_FORCEINLINE inline __attribute__ ((__always_inline__))
# define BOOST_NOINLINE __attribute__ ((__noinline__)) # define BOOST_NOINLINE __attribute__ ((__noinline__))
# define BOOST_ALIGNMENT(x) __attribute__ ((__aligned__(x))) // No BOOST_ALIGNMENT - explicit alignment support is broken (V2R1).
#endif #endif
extern "builtin" long __builtin_expect(long, long); extern "builtin" long __builtin_expect(long, long);

5
include/boost/detail/workaround.hpp
View File

@ -90,6 +90,11 @@
#else #else
#define BOOST_GCC_WORKAROUND_GUARD 0 #define BOOST_GCC_WORKAROUND_GUARD 0
#endif #endif
#ifndef BOOST_XLCPP_ZOS
#define BOOST_XLCPP_ZOS_WORKAROUND_GUARD 1
#else
#define BOOST_XLCPP_ZOS_WORKAROUND_GUARD 0
#endif
#ifndef __IBMCPP__ #ifndef __IBMCPP__
#define __IBMCPP___WORKAROUND_GUARD 1 #define __IBMCPP___WORKAROUND_GUARD 1
#else #else