Changeset 80712


Ignore:
Timestamp:
Sep 26, 2012, 6:47:08 PM (6 years ago)
Author:
Eric Niebler
Message:

remove workaround for gcc-4.4, boost.config is correct now

Location:
trunk/boost/utility
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/boost/utility/detail/result_of_iterate.hpp

    r80656 r80712  
    5757namespace detail {
    5858
    59 #ifdef BOOST_RESULT_OF_NO_SFINAE_EXPR
     59#ifdef BOOST_NO_SFINAE_EXPR
    6060
    6161template<typename F>
     
    120120};
    121121
    122 #else // BOOST_RESULT_OF_NO_SFINAE_EXPR
     122#else // BOOST_NO_SFINAE_EXPR
    123123
    124124template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_PP_ITERATION(),typename T)>
     
    136136};
    137137
    138 #endif // BOOST_RESULT_OF_NO_SFINAE_EXPR
     138#endif // BOOST_NO_SFINAE_EXPR
    139139
    140140} // namespace detail
  • trunk/boost/utility/result_of.hpp

    r80656 r80712  
    5555#endif
    5656
    57 #if defined(BOOST_NO_SFINAE_EXPR) || (BOOST_WORKAROUND(__GNUC__, == 4) && __GNUC_MINOR__ < 5)
    58 #  define BOOST_RESULT_OF_NO_SFINAE_EXPR
    59 #endif
    60 
    6157namespace boost {
    6258
     
    7167template<typename F, typename FArgs, bool HasResultType> struct tr1_result_of_impl;
    7268
    73 #ifdef BOOST_RESULT_OF_NO_SFINAE_EXPR
    74 
    75 template<typename T> T result_of_decay(T);
     69#ifdef BOOST_NO_SFINAE_EXPR
    7670
    7771struct result_of_private_type {};
     
    123117template<typename F, bool TestCallability = true> struct cpp0x_result_of_impl;
    124118
    125 #else // BOOST_RESULT_OF_NO_SFINAE_EXPR
     119#else // BOOST_NO_SFINAE_EXPR
    126120
    127121template<typename T>
     
    133127template<typename F, typename Enable = void> struct cpp0x_result_of_impl {};
    134128
    135 #endif // BOOST_RESULT_OF_NO_SFINAE_EXPR
     129#endif // BOOST_NO_SFINAE_EXPR
    136130
    137131template<typename F>
Note: See TracChangeset for help on using the changeset viewer.