Ticket #9891: 0001-preprocessor-fix-GCC-Wundef-warnings.patch

File 0001-preprocessor-fix-GCC-Wundef-warnings.patch, 5.2 KB (added by mstahl@…, 9 years ago)

  • include/boost/preprocessor/config/config.hpp 

    From b77920e7b588f959d4a601b17e344cadad4a4f5e Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Mon, 14 Apr 2014 12:06:13 +0200
Subject: [PATCH] preprocessor: fix GCC -Wundef warnings

Signed-off-by: Michael Stahl <mstahl@redhat.com>
---
 include/boost/preprocessor/config/config.hpp | 2 +-
 include/boost/preprocessor/tuple/elem.hpp    | 2 +-
 include/boost/preprocessor/tuple/rem.hpp     | 2 +-
 include/boost/preprocessor/tuple/to_list.hpp | 2 +-
 include/boost/preprocessor/variadic/elem.hpp | 2 +-
 include/boost/preprocessor/variadic/size.hpp | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/boost/preprocessor/config/config.hpp b/include/boost/preprocessor/config/config.hpp
index b6afbab..c3ae727 100644
    a b  
    8282#        define BOOST_PP_VARIADICS 1
    8383#        define BOOST_PP_VARIADICS_MSVC 1
    8484#    /* Wave (C/C++), GCC (C++) */
    85 #    elif defined __WAVE__ && __WAVE_HAS_VARIADICS__ || defined __GNUC__ && __GXX_EXPERIMENTAL_CXX0X__
     85#    elif defined __WAVE__ && __WAVE_HAS_VARIADICS__ || defined __GNUC__ && defined __GXX_EXPERIMENTAL_CXX0X__ && __GXX_EXPERIMENTAL_CXX0X__
    8686#        define BOOST_PP_VARIADICS 1
    8787#    /* EDG-based (C/C++), GCC (C), and unknown (C/C++) */
    8888#    elif !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L

  • include/boost/preprocessor/tuple/elem.hpp 

    diff --git a/include/boost/preprocessor/tuple/elem.hpp b/include/boost/preprocessor/tuple/elem.hpp
index 3eba1c5..c446fc6 100644
    a b  
    2222# include <boost/preprocessor/variadic/elem.hpp>
    2323#
    2424# if BOOST_PP_VARIADICS
    25 #    if BOOST_PP_VARIADICS_MSVC
     25#    if defined(BOOST_PP_VARIADICS_MSVC) && BOOST_PP_VARIADICS_MSVC
    2626#        define BOOST_PP_TUPLE_ELEM(...) BOOST_PP_TUPLE_ELEM_I(BOOST_PP_OVERLOAD(BOOST_PP_TUPLE_ELEM_O_, __VA_ARGS__), (__VA_ARGS__))
    2727#        define BOOST_PP_TUPLE_ELEM_I(m, args) BOOST_PP_TUPLE_ELEM_II(m, args)
    2828#        define BOOST_PP_TUPLE_ELEM_II(m, args) BOOST_PP_CAT(m ## args,)

  • include/boost/preprocessor/tuple/rem.hpp 

    diff --git a/include/boost/preprocessor/tuple/rem.hpp b/include/boost/preprocessor/tuple/rem.hpp
index 270c31a..8987a69 100644
    a b  
    110110# /* BOOST_PP_TUPLE_REM_CTOR */
    111111#
    112112# if BOOST_PP_VARIADICS
    113 #    if BOOST_PP_VARIADICS_MSVC
     113#    if defined(BOOST_PP_VARIADICS_MSVC) && BOOST_PP_VARIADICS_MSVC
    114114#        define BOOST_PP_TUPLE_REM_CTOR(...) BOOST_PP_TUPLE_REM_CTOR_I(BOOST_PP_OVERLOAD(BOOST_PP_TUPLE_REM_CTOR_O_, __VA_ARGS__), (__VA_ARGS__))
    115115#        define BOOST_PP_TUPLE_REM_CTOR_I(m, args) BOOST_PP_TUPLE_REM_CTOR_II(m, args)
    116116#        define BOOST_PP_TUPLE_REM_CTOR_II(m, args) BOOST_PP_CAT(m ## args,)

  • include/boost/preprocessor/tuple/to_list.hpp 

    diff --git a/include/boost/preprocessor/tuple/to_list.hpp b/include/boost/preprocessor/tuple/to_list.hpp
index da7828f..7994624 100644
    a b  
    2424# /* BOOST_PP_TUPLE_TO_LIST */
    2525#
    2626# if BOOST_PP_VARIADICS
    27 #    if BOOST_PP_VARIADICS_MSVC
     27#    if defined(BOOST_PP_VARIADICS_MSVC) && BOOST_PP_VARIADICS_MSVC
    2828#        define BOOST_PP_TUPLE_TO_LIST(...) BOOST_PP_TUPLE_TO_LIST_I(BOOST_PP_OVERLOAD(BOOST_PP_TUPLE_TO_LIST_O_, __VA_ARGS__), (__VA_ARGS__))
    2929#        define BOOST_PP_TUPLE_TO_LIST_I(m, args) BOOST_PP_TUPLE_TO_LIST_II(m, args)
    3030#        define BOOST_PP_TUPLE_TO_LIST_II(m, args) BOOST_PP_CAT(m ## args,)

  • include/boost/preprocessor/variadic/elem.hpp 

    diff --git a/include/boost/preprocessor/variadic/elem.hpp b/include/boost/preprocessor/variadic/elem.hpp
index be38a94..b37a99d 100644
    a b  
    1919# /* BOOST_PP_VARIADIC_ELEM */
    2020#
    2121# if BOOST_PP_VARIADICS
    22 #    if BOOST_PP_VARIADICS_MSVC
     22#    if defined(BOOST_PP_VARIADICS_MSVC) && BOOST_PP_VARIADICS_MSVC
    2323#        define BOOST_PP_VARIADIC_ELEM(n, ...) BOOST_PP_VARIADIC_ELEM_I(n,__VA_ARGS__)
    2424#        define BOOST_PP_VARIADIC_ELEM_I(n, ...) BOOST_PP_CAT(BOOST_PP_CAT(BOOST_PP_VARIADIC_ELEM_, n)(__VA_ARGS__,),)
    2525#    else

  • include/boost/preprocessor/variadic/size.hpp 

    diff --git a/include/boost/preprocessor/variadic/size.hpp b/include/boost/preprocessor/variadic/size.hpp
index b92a5ff..40bd311 100644
    a b  
    1919# /* BOOST_PP_VARIADIC_SIZE */
    2020#
    2121# if BOOST_PP_VARIADICS
    22 #    if BOOST_PP_VARIADICS_MSVC
     22#    if defined(BOOST_PP_VARIADICS_MSVC) && BOOST_PP_VARIADICS_MSVC
    2323#        define BOOST_PP_VARIADIC_SIZE(...) BOOST_PP_CAT(BOOST_PP_VARIADIC_SIZE_I(__VA_ARGS__, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,),)
    2424#    else
    2525#        define BOOST_PP_VARIADIC_SIZE(...) BOOST_PP_VARIADIC_SIZE_I(__VA_ARGS__, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,)