forked from boostorg/config
Have config/select_stdlib_config.hpp and config/stdlib/stlport.hpp use <cstddef> instead of <utility> to determine which standard library is in use. For std lib implementations that rely on Boost components like TypeTraits, Bind, Function, or SmartPtr, this helps to avoid circular header dependency issues, since <cstddef> is much less likely to pull in Boost libraries than <utility>.
In get_pointer.hpp, switched to using <boost/config/no_tr1/memory.hpp> instead of using <memory> directly. As above, this helps avoid circular header dependency issues in Boost-supplemented std libs (specifically it avoids issues when <memory> pulls in pieces of Boost.SmartPtr). These two changes were made in response to testing done with STLport 5.2.1 using the _STLP_USE_BOOST_SUPPORT option. [SVN r52221]
This commit is contained in:
@ -12,12 +12,12 @@
|
|||||||
// locate which std lib we are using and define BOOST_STDLIB_CONFIG as needed:
|
// locate which std lib we are using and define BOOST_STDLIB_CONFIG as needed:
|
||||||
|
|
||||||
// we need to include a std lib header here in order to detect which
|
// we need to include a std lib header here in order to detect which
|
||||||
// library is in use, use <utility> as it's about the smallest
|
// library is in use, use <cstddef> as it's one of the smaller std lib headers
|
||||||
// of the std lib headers - do not rely on this header being included -
|
// - do not rely on this header being included -
|
||||||
// users can short-circuit this header if they know whose std lib
|
// users can short-circuit this header if they know whose std lib
|
||||||
// they are using.
|
// they are using.
|
||||||
|
|
||||||
#include <boost/config/no_tr1/utility.hpp>
|
#include <cstddef>
|
||||||
|
|
||||||
#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
|
#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
|
||||||
// STLPort library; this _must_ come first, otherwise since
|
// STLPort library; this _must_ come first, otherwise since
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
// STLPort standard library config:
|
// STLPort standard library config:
|
||||||
|
|
||||||
#if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
|
#if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
|
||||||
# include <boost/config/no_tr1/utility.hpp>
|
# include <cstddef>
|
||||||
# if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
|
# if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
|
||||||
# error "This is not STLPort!"
|
# error "This is not STLPort!"
|
||||||
# endif
|
# endif
|
||||||
|
Reference in New Issue
Block a user