$NetBSD: patch-cppcms__boost_cppcms__boost_detail_container__fwd.hpp,v 1.1 2013/07/16 10:12:48 joerg Exp $ --- cppcms_boost/cppcms_boost/detail/container_fwd.hpp.orig 2010-05-14 13:53:44.000000000 +0000 +++ cppcms_boost/cppcms_boost/detail/container_fwd.hpp @@ -12,12 +12,7 @@ #include #include - -#if ((defined(__GLIBCPP__) || defined(__GLIBCXX__)) && defined(_GLIBCXX_DEBUG)) \ - || CPPCMS_BOOST_WORKAROUND(__BORLANDC__, > 0x551) \ - || CPPCMS_BOOST_WORKAROUND(__DMC__, CPPCMS_BOOST_TESTED_AT(0x842)) \ - || (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) - +#include #include #include #include @@ -27,73 +22,4 @@ #include #include -#else - -#include - -#if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION) && \ - defined(__STL_CONFIG_H) - -#define CPPCMS_BOOST_CONTAINER_FWD_BAD_BITSET - -#if !defined(__STL_NON_TYPE_TMPL_PARAM_BUG) -#define CPPCMS_BOOST_CONTAINER_FWD_BAD_DEQUE -#endif - -#endif - -#if defined(CPPCMS_BOOST_CONTAINER_FWD_BAD_DEQUE) -#include -#endif - -#if defined(CPPCMS_BOOST_CONTAINER_FWD_BAD_BITSET) -#include -#endif - -#if defined(CPPCMS_BOOST_MSVC) -#pragma warning(push) -#pragma warning(disable:4099) // struct/class mismatch in fwd declarations -#endif - -namespace std -{ - template class allocator; - template class basic_string; - -#if CPPCMS_BOOST_WORKAROUND(__GNUC__, < 3) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION) - template struct string_char_traits; -#else - template struct char_traits; -#endif - - template class complex; -} - -// gcc 3.4 and greater -namespace std -{ -#if !defined(CPPCMS_BOOST_CONTAINER_FWD_BAD_DEQUE) - template class deque; -#endif - - template class list; - template class vector; - template class map; - template - class multimap; - template class set; - template class multiset; - -#if !defined(CPPCMS_BOOST_CONTAINER_FWD_BAD_BITSET) - template class bitset; -#endif - template struct pair; -} - -#if defined(CPPCMS_BOOST_MSVC) -#pragma warning(pop) -#endif - -#endif - #endif