Ignore:
Timestamp:
Dec 8, 2012, 11:38:12 AM (6 years ago)
Author:
olli
Message:

coroutine: fix min/max problem (Windows macros)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/boost/coroutine/detail/stack_allocator_windows.hpp

    r81767 r81789  
    9090    static std::size_t default_stacksize()
    9191    {
    92         using namespace std;
    93 
    9492        std::size_t size = 64 * 1024; // 64 kB
    9593        if ( is_stack_unbound() )
    96             return max( size, minimum_stacksize() );
     94            return (std::max)( size, minimum_stacksize() );
    9795
    9896        BOOST_ASSERT( maximum_stacksize() >= minimum_stacksize() );
    9997        return maximum_stacksize() == minimum_stacksize()
    10098            ? minimum_stacksize()
    101             : min( size, maximum_stacksize() );
     99            : ( std::min)( size, maximum_stacksize() );
    102100    }
    103101
Note: See TracChangeset for help on using the changeset viewer.