|
From: Foster B. <fos...@us...> - 2005-04-18 21:16:16
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/third_party/boost_tp/adobe In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27679/third_party/boost_tp/adobe Added Files: boost_1_32_0_patch_01.txt Log Message: SO SORRY for the large qty of emails -- creating a branch for Adobe Begin refactoring. --- NEW FILE: boost_1_32_0_patch_01.txt --- diff -ruN boost_1_32_0/boost/optional/optional.hpp boost/boost/optional/optional.hpp --- boost_1_32_0/boost/optional/optional.hpp Tue Dec 21 16:38:04 2004 +++ boost/boost/optional/optional.hpp Tue Dec 21 16:37:43 2004 @@ -635,14 +635,16 @@ bool operator >= ( optional<T> const& x, detail::none_t const& y ) { return !( x < y ) ; } +// ADOBE (sparent) : Removed unused paramter to avoid warnings. template<class T> inline -bool operator == ( detail::none_t const& x, optional<T> const& y ) +bool operator == ( detail::none_t const& /* x */, optional<T> const& y ) { return equal_pointees(optional<T>() ,y); } +// ADOBE (sparent) : Removed unused paramter to avoid warnings. template<class T> inline -bool operator < ( detail::none_t const& x, optional<T> const& y ) +bool operator < ( detail::none_t const& /* x */, optional<T> const& y ) { return less_pointees(optional<T>() ,y); } template<class T> diff -ruN boost_1_32_0/boost/range/iterator.hpp boost/boost/range/iterator.hpp --- boost_1_32_0/boost/range/iterator.hpp Tue Dec 21 16:38:21 2004 +++ boost/boost/range/iterator.hpp Tue Dec 21 16:38:34 2004 @@ -37,6 +37,17 @@ typedef BOOST_DEDUCED_TYPENAME C::iterator type; }; +/* + ADOBE (sparent) : Codewarrior 9.3 incorrectly tries to instantiate + range_iterator for constant container (though it never actually uses it) + when instantiating begin() and end(). This generates an error if C::iterator + is not defined. This stubs the struct so we can continue gracefully. +*/ + + #if BOOST_WORKAROUND(__MWERKS__, <= 0x3204) + template< typename C > struct range_iterator<const C> { }; + #endif + ////////////////////////////////////////////////////////////////////////// // pair ////////////////////////////////////////////////////////////////////////// diff -ruN boost_1_32_0/boost/signals/connection.hpp boost/boost/signals/connection.hpp --- boost_1_32_0/boost/signals/connection.hpp Tue Dec 21 16:38:50 2004 +++ boost/boost/signals/connection.hpp Tue Dec 21 16:39:09 2004 @@ -184,6 +184,11 @@ bool auto_disconnect; }; } // end namespace detail + + // ADOBE (sparent) : prototypes were missing. + void swap(scoped_connection& c1, scoped_connection& c2); + void swap(connection& c1, connection& c2); + } // end namespace BOOST_SIGNALS_NAMESPACE } // end namespace boost |