Ticket #2328: workaround.patch

File workaround.patch, 2.1 KB (added by Daniel James, 14 years ago)

Extra guards for workaround.

  • boost/detail/workaround.hpp

     
    4545#else
    4646#define __BORLANDC___WORKAROUND_GUARD 0
    4747#endif
    48 #ifndef __MSC_VER
    49 #define __MSC_VER_WORKAROUND_GUARD 1
     48#ifndef _MSC_VER
     49#define _MSC_VER_WORKAROUND_GUARD 1
    5050#else
    51 #define __MSC_VER_WORKAROUND_GUARD 0
     51#define _MSC_VER_WORKAROUND_GUARD 0
    5252#endif
    5353#ifndef _MSC_FULL_VER
    5454#define _MSC_FULL_VER_WORKAROUND_GUARD 1
     
    9595#else
    9696#define __MWERKS___WORKAROUND_GUARD 0
    9797#endif
     98#ifndef __EDG__
     99#define __EDG___WORKAROUND_GUARD 1
     100#else
     101#define __EDG___WORKAROUND_GUARD 0
     102#endif
    98103#ifndef __EDG_VERSION__
    99104#define __EDG_VERSION___WORKAROUND_GUARD 1
    100105#else
     
    105110#else
    106111#define __HP_aCC_WORKAROUND_GUARD 0
    107112#endif
     113#ifndef __hpxstd98
     114#define __hpxstd98_WORKAROUND_GUARD 1
     115#else
     116#define __hpxstd98_WORKAROUND_GUARD 0
     117#endif
    108118#ifndef _CRAYC
    109119#define _CRAYC_WORKAROUND_GUARD 1
    110120#else
     
    120130#else
    121131#define MPW_CPLUS_WORKAROUND_GUARD 0
    122132#endif
     133#ifndef __COMO__
     134#define __COMO___WORKAROUND_GUARD 1
     135#else
     136#define __COMO___WORKAROUND_GUARD 0
     137#endif
     138#ifndef __COMO_VERSION__
     139#define __COMO_VERSION___WORKAROUND_GUARD 1
     140#else
     141#define __COMO_VERSION___WORKAROUND_GUARD 0
     142#endif
     143#ifndef __INTEL_COMPILER
     144#define __INTEL_COMPILER_WORKAROUND_GUARD 1
     145#else
     146#define __INTEL_COMPILER_WORKAROUND_GUARD 0
     147#endif
     148#ifndef __ICL
     149#define __ICL_WORKAROUND_GUARD 1
     150#else
     151#define __ICL_WORKAROUND_GUARD 0
     152#endif
     153#ifndef _COMPILER_VERSION
     154#define _COMPILER_VERSION_WORKAROUND_GUARD 1
     155#else
     156#define _COMPILER_VERSION_WORKAROUND_GUARD 0
     157#endif
    123158
    124159#ifndef _RWSTD_VER
    125160#define _RWSTD_VER_WORKAROUND_GUARD 1
    126161#else
    127162#define _RWSTD_VER_WORKAROUND_GUARD 0
    128163#endif
     164#ifndef BOOST_RWSTD_VER
     165#define BOOST_RWSTD_VER_WORKAROUND_GUARD 1
     166#else
     167#define BOOST_RWSTD_VER_WORKAROUND_GUARD 0
     168#endif
     169#ifndef __GLIBCPP__
     170#define __GLIBCPP___WORKAROUND_GUARD 1
     171#else
     172#define __GLIBCPP___WORKAROUND_GUARD 0
     173#endif
    129174#ifndef _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
    130175#define _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC_WORKAROUND_GUARD 1
    131176#else