--- a/boost/test/impl/execution_monitor.ipp +++ b/boost/test/impl/execution_monitor.ipp @@ -84,7 +84,7 @@ using std::va_list; typedef unsigned uintptr_t; # endif -# if BOOST_WORKAROUND(_MSC_VER, < 1300 ) || defined(UNDER_CE) +# if BOOST_WORKAROUND(_MSC_VER, < 1300 ) || (defined(UNDER_CE) && BOOST_WORKAROUND(_MSC_VER, < 1500 )) typedef void* uintptr_t; # endif