Ticket #9256: mpl_clang_winbuild.patch

File mpl_clang_winbuild.patch, 1.3 KB (added by marci_r@…, 9 years ago)

Compile fix for clang-cl

  • and.hpp

     
    2929// has to be checked in a separate condition, otherwise GCC complains
    3030// about 'and' being an alternative token
    3131#if defined(_MSC_VER)
    32 #ifndef __GCCXML__
     32#if !defined(__GCCXML__) && !defined(__clang__)
    3333#if defined(and)
    3434#   pragma push_macro("and")
    3535#   undef and
    … …  
    4242#   include <boost/mpl/aux_/include_preprocessed.hpp>
    4343
    4444#if defined(_MSC_VER)
    45 #ifndef __GCCXML__
     45#if !defined(__GCCXML__) && !defined(__clang__)
    4646#if defined(and)
    4747#   pragma pop_macro("and")
    4848#endif

  • or.hpp

     
    3030// has to be checked in a separate condition, otherwise GCC complains
    3131// about 'or' being an alternative token
    3232#if defined(_MSC_VER)
    33 #ifndef __GCCXML__
     33#if !defined(__GCCXML__) && !defined(__clang__)
    3434#if defined(or)
    3535#   pragma push_macro("or")
    3636#   undef or
    … …  
    4343#   include <boost/mpl/aux_/include_preprocessed.hpp>
    4444
    4545#if defined(_MSC_VER)
    46 #ifndef __GCCXML__
     46#if !defined(__GCCXML__) && !defined(__clang__)
    4747#if defined(or)
    4848#   pragma pop_macro("or")
    4949#endif