diff options
| author | void_17 <heroerror3@gmail.com> | 2026-03-02 17:37:16 +0700 |
|---|---|---|
| committer | void_17 <heroerror3@gmail.com> | 2026-03-02 17:37:16 +0700 |
| commit | 119bff351450ea16ffda550b6e0f67379b29f708 (patch) | |
| tree | d9f28714afd516bc2450f33b0a77c5e05ff4de90 /Minecraft.Client/PS3 | |
| parent | 8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff) | |
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.Client/PS3')
202 files changed, 3627 insertions, 3627 deletions
diff --git a/Minecraft.Client/PS3/PS3Extras/Ps3Types.h b/Minecraft.Client/PS3/PS3Extras/Ps3Types.h index 6cacd7a0..ade37607 100644 --- a/Minecraft.Client/PS3/PS3Extras/Ps3Types.h +++ b/Minecraft.Client/PS3/PS3Extras/Ps3Types.h @@ -25,7 +25,7 @@ using std::tr1::const_pointer_cast; using std::tr1::dynamic_pointer_cast; using std::tr1::enable_shared_from_this; using std::tr1::get_deleter; -using std::tr1::std::shared_ptr; +using std::tr1::shared_ptr; using std::tr1::static_pointer_cast; using std::tr1::swap; using std::tr1::weak_ptr; @@ -62,7 +62,7 @@ using boost::hash; class Cnullptr{ public: template<typename T> - operator std::shared_ptr<T>() { return std::shared_ptr<T>(); } + operator shared_ptr<T>() { return shared_ptr<T>(); } }; extern Cnullptr nullptr; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/binary_iarchive.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/binary_iarchive.hpp index 9d786645..638d9967 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/binary_iarchive.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/binary_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // binary_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,7 +25,7 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { // do not derive from the classes below. If you want to extend this functionality @@ -33,10 +33,10 @@ namespace archive { // preserve correct static polymorphism. // same as binary_iarchive below - without the shared_ptr_helper -class naked_binary_iarchive : +class naked_binary_iarchive : public binary_iarchive_impl< - boost::archive::naked_binary_iarchive, - std::istream::char_type, + boost::archive::naked_binary_iarchive, + std::istream::char_type, std::istream::traits_type > { @@ -56,22 +56,22 @@ public: } // namespace archive } // namespace boost -// note special treatment of std::shared_ptr. This type needs a special +// note special treatment of shared_ptr. This type needs a special // structure associated with every archive. We created a "mix-in" -// class to provide this functionality. Since std::shared_ptr holds a +// class to provide this functionality. Since shared_ptr holds a // special esteem in the boost library - we included it here by default. #include <boost/archive/shared_ptr_helper.hpp> -namespace boost { +namespace boost { namespace archive { // do not derive from this class. If you want to extend this functionality // via inhertance, derived from binary_iarchive_impl instead. This will // preserve correct static polymorphism. -class binary_iarchive : +class binary_iarchive : public binary_iarchive_impl< - boost::archive::binary_iarchive, - std::istream::char_type, + boost::archive::binary_iarchive, + std::istream::char_type, std::istream::traits_type >, public detail::shared_ptr_helper diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/binary_wiarchive.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/binary_wiarchive.hpp index 81f67c04..b5f6a710 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/binary_wiarchive.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/binary_wiarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // binary_wiarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,29 +25,29 @@ #include <boost/archive/binary_iarchive_impl.hpp> #include <boost/archive/detail/register_archive.hpp> -namespace boost { +namespace boost { namespace archive { // same as binary_wiarchive below - without the shared_ptr_helper -class naked_binary_wiarchive : +class naked_binary_wiarchive : public binary_iarchive_impl< - boost::archive::naked_binary_wiarchive, - std::wistream::char_type, + boost::archive::naked_binary_wiarchive, + std::wistream::char_type, std::wistream::traits_type > { public: naked_binary_wiarchive(std::wistream & is, unsigned int flags = 0) : binary_iarchive_impl< - naked_binary_wiarchive, - std::wistream::char_type, + naked_binary_wiarchive, + std::wistream::char_type, std::wistream::traits_type >(is, flags) {} naked_binary_wiarchive(std::wstreambuf & bsb, unsigned int flags = 0) : binary_iarchive_impl< - naked_binary_wiarchive, - std::wistream::char_type, + naked_binary_wiarchive, + std::wistream::char_type, std::wistream::traits_type >(bsb, flags) {} @@ -56,16 +56,16 @@ public: } // namespace archive } // namespace boost -// note special treatment of std::shared_ptr. This type needs a special +// note special treatment of shared_ptr. This type needs a special // structure associated with every archive. We created a "mix-in" -// class to provide this functionality. Since std::shared_ptr holds a +// class to provide this functionality. Since shared_ptr holds a // special esteem in the boost library - we included it here by default. #include <boost/archive/shared_ptr_helper.hpp> -namespace boost { +namespace boost { namespace archive { -class binary_wiarchive : +class binary_wiarchive : public binary_iarchive_impl< binary_wiarchive, std::wistream::char_type, std::wistream::traits_type > diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/polymorphic_iarchive.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/polymorphic_iarchive.hpp index 828f03f6..ce780c84 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/polymorphic_iarchive.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/polymorphic_iarchive.hpp @@ -40,7 +40,7 @@ namespace std{ namespace boost { template<class T> -class std::shared_ptr; +class shared_ptr; namespace serialization { class extended_type_info; } // namespace serialization @@ -155,9 +155,9 @@ public: #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas -// note special treatment of std::shared_ptr. This type needs a special +// note special treatment of shared_ptr. This type needs a special // structure associated with every archive. We created a "mix-in" -// class to provide this functionality. Since std::shared_ptr holds a +// class to provide this functionality. Since shared_ptr holds a // special esteem in the boost library - we included it here by default. #include <boost/archive/shared_ptr_helper.hpp> diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/polymorphic_oarchive.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/polymorphic_oarchive.hpp index 458df7eb..183140ee 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/polymorphic_oarchive.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/polymorphic_oarchive.hpp @@ -39,7 +39,7 @@ namespace std{ namespace boost { template<class T> -class std::shared_ptr; +class shared_ptr; namespace serialization { class extended_type_info; } // namespace serialization diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/shared_ptr_helper.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/shared_ptr_helper.hpp index f49f768c..39e6eb82 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/shared_ptr_helper.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/shared_ptr_helper.hpp @@ -22,7 +22,7 @@ #include <cstddef> // NULL #include <boost/config.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/type_traits/is_polymorphic.hpp> #include <boost/serialization/type_info_implementation.hpp> @@ -35,16 +35,16 @@ #include <boost/archive/detail/abi_prefix.hpp> // must be the last headern namespace boost_132 { - template<class T> class std::shared_ptr; + template<class T> class shared_ptr; } namespace boost { - template<class T> class std::shared_ptr; + template<class T> class shared_ptr; namespace serialization { class extended_type_info; template<class Archive, class T> inline void load( Archive & ar, - boost::std::shared_ptr< T > &t, + boost::shared_ptr< T > &t, const unsigned int file_version ); } @@ -57,14 +57,14 @@ namespace detail { class shared_ptr_helper { struct collection_type_compare { bool operator()( - const std::shared_ptr<const void> &lhs, - const std::shared_ptr<const void> &rhs + const shared_ptr<const void> &lhs, + const shared_ptr<const void> &rhs )const{ return lhs.get() < rhs.get(); } }; typedef std::set< - boost::std::shared_ptr<const void>, + boost::shared_ptr<const void>, collection_type_compare > collection_type; typedef collection_type::const_iterator iterator_type; @@ -72,7 +72,7 @@ class shared_ptr_helper { // is used to "match up" shared pointers loaded at different // points in the archive. Note, we delay construction until // it is actually used since this is by default included as - // a "mix-in" even if std::shared_ptr isn't used. + // a "mix-in" even if shared_ptr isn't used. collection_type * m_pointers; struct null_deleter { @@ -95,7 +95,7 @@ public: template<class Archive, class T> friend inline void boost::serialization::load( Archive & ar, - boost::std::shared_ptr< T > &t, + boost::shared_ptr< T > &t, const unsigned int file_version ); #endif @@ -109,44 +109,44 @@ public: // new system which is disjoint from this set. This is implemented // by a change in load_construct_data below. It makes this file suitable // only for loading pointers into a 1.33 or later boost system. - std::list<boost_132::std::shared_ptr<const void> > * m_pointers_132; + std::list<boost_132::shared_ptr<const void> > * m_pointers_132; // #endif // returns pointer to object and an indicator whether this is a // new entry (true) or a previous one (false) - BOOST_ARCHIVE_DECL(std::shared_ptr<void>) + BOOST_ARCHIVE_DECL(shared_ptr<void>) get_od( const void * od, - const boost::serialization::extended_type_info * true_type, + const boost::serialization::extended_type_info * true_type, const boost::serialization::extended_type_info * this_type ); BOOST_ARCHIVE_DECL(void) - append(const boost::std::shared_ptr<const void> &); + append(const boost::shared_ptr<const void> &); template<class T> struct non_polymorphic { - static const boost::serialization::extended_type_info * + static const boost::serialization::extended_type_info * get_object_identifier(T &){ return & boost::serialization::singleton< - BOOST_DEDUCED_TYPENAME + BOOST_DEDUCED_TYPENAME boost::serialization::type_info_implementation< T >::type >::get_const_instance(); } }; template<class T> struct polymorphic { - static const boost::serialization::extended_type_info * + static const boost::serialization::extended_type_info * get_object_identifier(T & t){ return boost::serialization::singleton< - BOOST_DEDUCED_TYPENAME + BOOST_DEDUCED_TYPENAME boost::serialization::type_info_implementation< T >::type >::get_const_instance().get_derived_extended_type_info(t); } }; public: template<class T> - void reset(std::shared_ptr< T > & s, T * t){ + void reset(shared_ptr< T > & s, T * t){ if(NULL == t){ s.reset(); return; @@ -175,9 +175,9 @@ public: this_type->get_debug_info() ) ); - std::shared_ptr<void> r = + shared_ptr<void> r = get_od( - static_cast<const void *>(t), + static_cast<const void *>(t), true_type, this_type ); @@ -188,11 +188,11 @@ public: *this_type, static_cast<const void *>(t) ); - std::shared_ptr<const void> sp(s, od); + shared_ptr<const void> sp(s, od); append(sp); } else{ - s = std::shared_ptr< T >( + s = shared_ptr< T >( r, static_cast<T *>(r.get()) ); @@ -201,7 +201,7 @@ public: // #ifdef BOOST_SERIALIZATION_SHARED_PTR_132_HPP BOOST_ARCHIVE_DECL(void) - append(const boost_132::std::shared_ptr<const void> & t); + append(const boost_132::shared_ptr<const void> & t); // #endif public: BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/text_iarchive.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/text_iarchive.hpp index 00be983e..298928b3 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/text_iarchive.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/text_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // text_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -32,11 +32,11 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { template<class Archive> -class text_iarchive_impl : +class text_iarchive_impl : public basic_text_iprimitive<std::istream>, public basic_text_iarchive<Archive> { @@ -62,16 +62,16 @@ protected: load(v); t = boost::serialization::item_version_type(v); } - BOOST_ARCHIVE_DECL(void) + BOOST_ARCHIVE_DECL(void) load(char * t); #ifndef BOOST_NO_INTRINSIC_WCHAR_T - BOOST_ARCHIVE_DECL(void) + BOOST_ARCHIVE_DECL(void) load(wchar_t * t); #endif - BOOST_ARCHIVE_DECL(void) + BOOST_ARCHIVE_DECL(void) load(std::string &s); #ifndef BOOST_NO_STD_WSTRING - BOOST_ARCHIVE_DECL(void) + BOOST_ARCHIVE_DECL(void) load(std::wstring &ws); #endif // note: the following should not needed - but one compiler (vc 7.1) @@ -85,10 +85,10 @@ protected: load_override(class_name_type & t, int); BOOST_ARCHIVE_DECL(void) init(); - BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) + BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) text_iarchive_impl(std::istream & is, unsigned int flags); // don't import inline definitions! leave this as a reminder. - //BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) + //BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) ~text_iarchive_impl(){}; }; @@ -97,7 +97,7 @@ protected: // preserve correct static polymorphism. // same as text_iarchive below - without the shared_ptr_helper -class naked_text_iarchive : +class naked_text_iarchive : public text_iarchive_impl<naked_text_iarchive> { public: @@ -117,9 +117,9 @@ public: #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas -// note special treatment of std::shared_ptr. This type needs a special +// note special treatment of shared_ptr. This type needs a special // structure associated with every archive. We created a "mix-in" -// class to provide this functionality. Since std::shared_ptr holds a +// class to provide this functionality. Since shared_ptr holds a // special esteem in the boost library - we included it here by default. #include <boost/archive/shared_ptr_helper.hpp> @@ -128,10 +128,10 @@ public: # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { -class text_iarchive : +class text_iarchive : public text_iarchive_impl<text_iarchive>, public detail::shared_ptr_helper { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/text_wiarchive.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/text_wiarchive.hpp index d96b816b..7451f3a6 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/text_wiarchive.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/text_wiarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // text_wiarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -36,11 +36,11 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { template<class Archive> -class text_wiarchive_impl : +class text_wiarchive_impl : public basic_text_iprimitive<std::wistream>, public basic_text_iarchive<Archive> { @@ -84,7 +84,7 @@ protected: void load_override(T & t, BOOST_PFTO int){ basic_text_iarchive<Archive>::load_override(t, 0); } - BOOST_WARCHIVE_DECL(BOOST_PP_EMPTY()) + BOOST_WARCHIVE_DECL(BOOST_PP_EMPTY()) text_wiarchive_impl(std::wistream & is, unsigned int flags); ~text_wiarchive_impl(){}; }; @@ -94,7 +94,7 @@ protected: // preserve correct static polymorphism. // same as text_wiarchive below - without the shared_ptr_helper -class naked_text_wiarchive : +class naked_text_wiarchive : public text_wiarchive_impl<naked_text_wiarchive> { public: @@ -113,9 +113,9 @@ public: #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas -// note special treatment of std::shared_ptr. This type needs a special +// note special treatment of shared_ptr. This type needs a special // structure associated with every archive. We created a "mix-in" -// class to provide this functionality. Since std::shared_ptr holds a +// class to provide this functionality. Since shared_ptr holds a // special esteem in the boost library - we included it here by default. #include <boost/archive/shared_ptr_helper.hpp> @@ -124,10 +124,10 @@ public: # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { -class text_wiarchive : +class text_wiarchive : public text_wiarchive_impl<text_wiarchive>, public detail::shared_ptr_helper { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/xml_iarchive.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/xml_iarchive.hpp index cdf51642..be6cfe49 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/xml_iarchive.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/xml_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // xml_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -32,7 +32,7 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { template<class CharType> @@ -40,7 +40,7 @@ class basic_xml_grammar; typedef basic_xml_grammar<char> xml_grammar; template<class Archive> -class xml_iarchive_impl : +class xml_iarchive_impl : public basic_text_iprimitive<std::istream>, public basic_xml_iarchive<Archive> { @@ -64,13 +64,13 @@ protected: void load(T & t){ basic_text_iprimitive<std::istream>::load(t); } - void + void load(version_type & t){ unsigned int v; load(v); t = version_type(v); } - void + void load(boost::serialization::item_version_type & t){ unsigned int v; load(v); @@ -96,7 +96,7 @@ protected: load_override(class_name_type & t, int); BOOST_ARCHIVE_DECL(void) init(); - BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) + BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) xml_iarchive_impl(std::istream & is, unsigned int flags); BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) ~xml_iarchive_impl(); @@ -107,7 +107,7 @@ protected: // preserve correct static polymorphism. // same as xml_iarchive below - without the shared_ptr_helper -class naked_xml_iarchive : +class naked_xml_iarchive : public xml_iarchive_impl<naked_xml_iarchive> { public: @@ -126,9 +126,9 @@ public: #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas -// note special treatment of std::shared_ptr. This type needs a special +// note special treatment of shared_ptr. This type needs a special // structure associated with every archive. We created a "mix-in" -// class to provide this functionality. Since std::shared_ptr holds a +// class to provide this functionality. Since shared_ptr holds a // special esteem in the boost library - we included it here by default. #include <boost/archive/shared_ptr_helper.hpp> @@ -137,10 +137,10 @@ public: # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { -class xml_iarchive : +class xml_iarchive : public xml_iarchive_impl<xml_iarchive>, public detail::shared_ptr_helper { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/xml_wiarchive.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/xml_wiarchive.hpp index 2fb0a538..59ebbb5e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/xml_wiarchive.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/archive/xml_wiarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // xml_wiarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -37,7 +37,7 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { template<class CharType> @@ -45,7 +45,7 @@ class basic_xml_grammar; typedef basic_xml_grammar<wchar_t> xml_wgrammar; template<class Archive> -class xml_wiarchive_impl : +class xml_wiarchive_impl : public basic_text_iprimitive<std::wistream>, public basic_xml_iarchive<Archive> { @@ -65,17 +65,17 @@ protected: return is; } template<class T> - void + void load(T & t){ basic_text_iprimitive<std::wistream>::load(t); } - void + void load(version_type & t){ unsigned int v; load(v); t = version_type(v); } - void + void load(boost::serialization::item_version_type & t){ unsigned int v; load(v); @@ -99,11 +99,11 @@ protected: } BOOST_WARCHIVE_DECL(void) load_override(class_name_type & t, int); - BOOST_WARCHIVE_DECL(void) + BOOST_WARCHIVE_DECL(void) init(); - BOOST_WARCHIVE_DECL(BOOST_PP_EMPTY()) + BOOST_WARCHIVE_DECL(BOOST_PP_EMPTY()) xml_wiarchive_impl(std::wistream & is, unsigned int flags) ; - BOOST_WARCHIVE_DECL(BOOST_PP_EMPTY()) + BOOST_WARCHIVE_DECL(BOOST_PP_EMPTY()) ~xml_wiarchive_impl(); }; @@ -112,7 +112,7 @@ protected: // preserve correct static polymorphism. // same as xml_wiarchive below - without the shared_ptr_helper -class naked_xml_wiarchive : +class naked_xml_wiarchive : public xml_wiarchive_impl<naked_xml_wiarchive> { public: @@ -126,14 +126,14 @@ public: } // namespace boost #ifdef BOOST_MSVC -# pragma warning(pop) +# pragma warning(pop) #endif #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas -// note special treatment of std::shared_ptr. This type needs a special +// note special treatment of shared_ptr. This type needs a special // structure associated with every archive. We created a "mix-in" -// class to provide this functionality. Since std::shared_ptr holds a +// class to provide this functionality. Since shared_ptr holds a // special esteem in the boost library - we included it here by default. #include <boost/archive/shared_ptr_helper.hpp> @@ -142,10 +142,10 @@ public: # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { -class xml_wiarchive : +class xml_wiarchive : public xml_wiarchive_impl<xml_wiarchive>, public detail::shared_ptr_helper { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/detail/config.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/detail/config.hpp index 9c93a2c7..40f770ca 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/detail/config.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/detail/config.hpp @@ -144,7 +144,7 @@ # endif // defined(BOOST_MSVC) #endif // !defined(BOOST_ASIO_DISABLE_STD_ARRAY) -// Standard library support for std::shared_ptr and weak_ptr. +// Standard library support for shared_ptr and weak_ptr. #if !defined(BOOST_ASIO_DISABLE_STD_SHARED_PTR) # if defined(__GNUC__) # if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 4) diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/detail/shared_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/detail/shared_ptr.hpp index 30ce3ffd..5f0da22e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/detail/shared_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/detail/shared_ptr.hpp @@ -1,5 +1,5 @@ // -// detail/std::shared_ptr.hpp +// detail/shared_ptr.hpp // ~~~~~~~~~~~~~~~~~~~~~ // // Copyright (c) 2003-2012 Christopher M. Kohlhoff (chris at kohlhoff dot com) @@ -20,7 +20,7 @@ #if defined(BOOST_ASIO_HAS_STD_SHARED_PTR) # include <memory> #else // defined(BOOST_ASIO_HAS_STD_SHARED_PTR) -# include <boost/std::shared_ptr.hpp> +# include <boost/shared_ptr.hpp> #endif // defined(BOOST_ASIO_HAS_STD_SHARED_PTR) namespace boost { @@ -30,7 +30,7 @@ namespace detail { #if defined(BOOST_ASIO_HAS_STD_SHARED_PTR) using std::shared_ptr; #else // defined(BOOST_ASIO_HAS_STD_SHARED_PTR) -using boost::std::shared_ptr; +using boost::shared_ptr; #endif // defined(BOOST_ASIO_HAS_STD_SHARED_PTR) } // namespace detail diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/detail/socket_ops.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/detail/socket_ops.hpp index 78b9da3f..92af9fbe 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/detail/socket_ops.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/detail/socket_ops.hpp @@ -18,7 +18,7 @@ #include <boost/asio/detail/config.hpp> #include <boost/system/error_code.hpp> -#include <boost/asio/detail/std::shared_ptr.hpp> +#include <boost/asio/detail/shared_ptr.hpp> #include <boost/asio/detail/socket_types.hpp> #include <boost/asio/detail/weak_ptr.hpp> @@ -60,7 +60,7 @@ enum typedef unsigned char state_type; struct noop_deleter { void operator()(void*) {} }; -typedef std::shared_ptr<void> shared_cancel_token_type; +typedef shared_ptr<void> shared_cancel_token_type; typedef weak_ptr<void> weak_cancel_token_type; BOOST_ASIO_DECL socket_type accept(socket_type s, socket_addr_type* addr, diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/io_service.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/io_service.hpp index e56aea45..43b94e46 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/io_service.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/io_service.hpp @@ -232,19 +232,19 @@ public: * <tt>delete static_cast<io_service::service*>(svc)</tt>. * * @note The destruction sequence described above permits programs to - * simplify their resource management by using @c std::shared_ptr<>. Where an + * simplify their resource management by using @c shared_ptr<>. Where an * object's lifetime is tied to the lifetime of a connection (or some other - * sequence of asynchronous operations), a @c std::shared_ptr to the object would + * sequence of asynchronous operations), a @c shared_ptr to the object would * be bound into the handlers for all asynchronous operations associated with * it. This works as follows: * * @li When a single connection ends, all associated asynchronous operations * complete. The corresponding handler objects are destroyed, and all - * @c std::shared_ptr references to the objects are destroyed. + * @c shared_ptr references to the objects are destroyed. * * @li To shut down the whole program, the io_service function stop() is * called to terminate any run() calls as soon as possible. The io_service - * destructor defined above destroys all handlers, causing all @c std::shared_ptr + * destructor defined above destroys all handlers, causing all @c shared_ptr * references to all connection objects to be destroyed. */ BOOST_ASIO_DECL ~io_service(); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/ip/basic_resolver_iterator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/ip/basic_resolver_iterator.hpp index fda14dcd..6e52a852 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/ip/basic_resolver_iterator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/ip/basic_resolver_iterator.hpp @@ -21,7 +21,7 @@ #include <iterator> #include <string> #include <vector> -#include <boost/asio/detail/std::shared_ptr.hpp> +#include <boost/asio/detail/shared_ptr.hpp> #include <boost/asio/detail/socket_ops.hpp> #include <boost/asio/detail/socket_types.hpp> #include <boost/asio/ip/basic_resolver_entry.hpp> @@ -184,7 +184,7 @@ private: } typedef std::vector<basic_resolver_entry<InternetProtocol> > values_type; - boost::asio::detail::std::shared_ptr<values_type> values_; + boost::asio::detail::shared_ptr<values_type> values_; std::size_t index_; }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/ssl/detail/impl/openssl_init.ipp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/ssl/detail/impl/openssl_init.ipp index ec1b26d5..fe62e6ea 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/ssl/detail/impl/openssl_init.ipp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/ssl/detail/impl/openssl_init.ipp @@ -37,7 +37,7 @@ public: do_init() { ::SSL_library_init(); - ::SSL_load_error_strings(); + ::SSL_load_error_strings(); ::OpenSSL_add_all_algorithms(); mutexes_.resize(::CRYPTO_num_locks()); @@ -75,7 +75,7 @@ private: #endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__) } - static void openssl_locking_func(int mode, int n, + static void openssl_locking_func(int mode, int n, const char* /*file*/, int /*line*/) { if (mode & CRYPTO_LOCK) @@ -85,7 +85,7 @@ private: } // Mutexes to be used in locking callbacks. - std::vector<boost::asio::detail::std::shared_ptr< + std::vector<boost::asio::detail::shared_ptr< boost::asio::detail::mutex> > mutexes_; #if !defined(BOOST_WINDOWS) && !defined(__CYGWIN__) @@ -94,10 +94,10 @@ private: #endif // !defined(BOOST_WINDOWS) && !defined(__CYGWIN__) }; -boost::asio::detail::std::shared_ptr<openssl_init_base::do_init> +boost::asio::detail::shared_ptr<openssl_init_base::do_init> openssl_init_base::instance() { - static boost::asio::detail::std::shared_ptr<do_init> init(new do_init); + static boost::asio::detail::shared_ptr<do_init> init(new do_init); return init; } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/ssl/detail/openssl_init.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/ssl/detail/openssl_init.hpp index 24d033fe..c68909d1 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/ssl/detail/openssl_init.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/ssl/detail/openssl_init.hpp @@ -18,7 +18,7 @@ #include <boost/asio/detail/config.hpp> #include <cstring> #include <boost/asio/detail/noncopyable.hpp> -#include <boost/asio/detail/std::shared_ptr.hpp> +#include <boost/asio/detail/shared_ptr.hpp> #include <boost/asio/detail/push_options.hpp> @@ -39,7 +39,7 @@ protected: // main, and therefore before any other threads can get started. The do_init // instance must be static in this function to ensure that it gets // initialised before any other global objects try to use it. - BOOST_ASIO_DECL static boost::asio::detail::std::shared_ptr<do_init> instance(); + BOOST_ASIO_DECL static boost::asio::detail::shared_ptr<do_init> instance(); }; template <bool Do_Init = true> @@ -68,7 +68,7 @@ private: // Reference to singleton do_init object to ensure that openssl does not get // cleaned up until the last user has finished with it. - boost::asio::detail::std::shared_ptr<do_init> ref_; + boost::asio::detail::shared_ptr<do_init> ref_; }; template <bool Do_Init> diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/config/compiler/gcc.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/config/compiler/gcc.hpp index a3469766..c0ac30af 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/config/compiler/gcc.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/config/compiler/gcc.hpp @@ -1,12 +1,12 @@ -// (C) Copyright John Maddock 2001 - 2003. -// (C) Copyright Darin Adler 2001 - 2002. -// (C) Copyright Jens Maurer 2001 - 2002. -// (C) Copyright Beman Dawes 2001 - 2003. -// (C) Copyright Douglas Gregor 2002. -// (C) Copyright David Abrahams 2002 - 2003. -// (C) Copyright Synge Todo 2003. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file +// (C) Copyright John Maddock 2001 - 2003. +// (C) Copyright Darin Adler 2001 - 2002. +// (C) Copyright Jens Maurer 2001 - 2002. +// (C) Copyright Beman Dawes 2001 - 2003. +// (C) Copyright Douglas Gregor 2002. +// (C) Copyright David Abrahams 2002 - 2003. +// (C) Copyright Synge Todo 2003. +// Use, modification and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org for most recent version. @@ -15,7 +15,7 @@ #if __GNUC__ < 3 # if __GNUC_MINOR__ == 91 - // egcs 1.1 won't parse std::shared_ptr.hpp without this: + // egcs 1.1 won't parse shared_ptr.hpp without this: # define BOOST_NO_AUTO_PTR # endif # if __GNUC_MINOR__ < 95 @@ -97,7 +97,7 @@ // #if !defined(__MINGW32__) && !defined(linux) && !defined(__linux) && !defined(__linux__) # define BOOST_HAS_THREADS -#endif +#endif // // gcc has "long long" @@ -116,7 +116,7 @@ // #if __GNUC__ >= 4 # if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && !defined(__CYGWIN__) - // All Win32 development environments, including 64-bit Windows and MinGW, define + // All Win32 development environments, including 64-bit Windows and MinGW, define // _WIN32 or one of its variant spellings. Note that Cygwin is a POSIX environment, // so does not define _WIN32 or its variants. # define BOOST_HAS_DECLSPEC @@ -128,7 +128,7 @@ # endif # define BOOST_SYMBOL_VISIBLE __attribute__((visibility("default"))) #else -// config/platform/win32.hpp will define BOOST_SYMBOL_EXPORT, etc., unless already defined +// config/platform/win32.hpp will define BOOST_SYMBOL_EXPORT, etc., unless already defined # define BOOST_SYMBOL_EXPORT #endif @@ -169,7 +169,7 @@ # define BOOST_NO_CXX11_RVALUE_REFERENCES # define BOOST_NO_CXX11_STATIC_ASSERT -// Variadic templates compiler: +// Variadic templates compiler: // http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html # if defined(__VARIADIC_TEMPLATES) || (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4) && defined(__GXX_EXPERIMENTAL_CXX0X__)) # define BOOST_HAS_VARIADIC_TMPL diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/config/compiler/sunpro_cc.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/config/compiler/sunpro_cc.hpp index e796a16d..65beb501 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/config/compiler/sunpro_cc.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/config/compiler/sunpro_cc.hpp @@ -1,10 +1,10 @@ -// (C) Copyright John Maddock 2001. -// (C) Copyright Jens Maurer 2001 - 2003. -// (C) Copyright Peter Dimov 2002. -// (C) Copyright Aleksey Gurtovoy 2002 - 2003. -// (C) Copyright David Abrahams 2002. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file +// (C) Copyright John Maddock 2001. +// (C) Copyright Jens Maurer 2001 - 2003. +// (C) Copyright Peter Dimov 2002. +// (C) Copyright Aleksey Gurtovoy 2002 - 2003. +// (C) Copyright David Abrahams 2002. +// Use, modification and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org for most recent version. @@ -34,7 +34,7 @@ # define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION # endif -# if (__SUNPRO_CC <= 0x530) +# if (__SUNPRO_CC <= 0x530) // Requesting debug info (-g) with Boost.Python results // in an internal compiler error for "static const" // initialized in-class. @@ -44,7 +44,7 @@ # define BOOST_NO_INCLASS_MEMBER_INITIALIZATION // SunPro 5.3 has better support for partial specialization, - // but breaks when compiling std::less<std::shared_ptr<T> > + // but breaks when compiling std::less<shared_ptr<T> > // (Jens Maurer 4 Nov 2001). // std::less specialization fixed as reported by George @@ -57,7 +57,7 @@ # define BOOST_NO_INTEGRAL_INT64_T # endif -# if (__SUNPRO_CC < 0x570) +# if (__SUNPRO_CC < 0x570) # define BOOST_NO_TEMPLATE_TEMPLATES // see http://lists.boost.org/MailArchives/boost/msg47184.php // and http://lists.boost.org/MailArchives/boost/msg47220.php @@ -65,7 +65,7 @@ # define BOOST_NO_SFINAE # define BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS # endif -# if (__SUNPRO_CC <= 0x580) +# if (__SUNPRO_CC <= 0x580) # define BOOST_NO_IS_ABSTRACT # endif diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/config/platform/win32.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/config/platform/win32.hpp index 066b2e88..39220127 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/config/platform/win32.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/config/platform/win32.hpp @@ -1,9 +1,9 @@ -// (C) Copyright John Maddock 2001 - 2003. -// (C) Copyright Bill Kempf 2001. -// (C) Copyright Aleksey Gurtovoy 2003. +// (C) Copyright John Maddock 2001 - 2003. +// (C) Copyright Bill Kempf 2001. +// (C) Copyright Aleksey Gurtovoy 2003. // (C) Copyright Rene Rivera 2005. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file +// Use, modification and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org for most recent version. @@ -46,11 +46,11 @@ // // Win32 will normally be using native Win32 threads, // but there is a pthread library avaliable as an option, -// we used to disable this when BOOST_DISABLE_WIN32 was +// we used to disable this when BOOST_DISABLE_WIN32 was // defined but no longer - this should allow some // files to be compiled in strict mode - while maintaining // a consistent setting of BOOST_HAS_THREADS across -// all translation units (needed for std::shared_ptr etc). +// all translation units (needed for shared_ptr etc). // #ifdef _WIN32_WCE diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/gregorian/greg_month.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/gregorian/greg_month.hpp index f326f91a..b48a8a89 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/gregorian/greg_month.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/gregorian/greg_month.hpp @@ -2,7 +2,7 @@ #define GREG_MONTH_HPP___ /* Copyright (c) 2002,2003 CrystalClear Software, Inc. - * Use, modification and distribution is subject to the + * Use, modification and distribution is subject to the * Boost Software License, Version 1.0. (See accompanying * file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) * Author: Jeff Garland, Bart Garst @@ -11,7 +11,7 @@ #include "boost/date_time/constrained_value.hpp" #include "boost/date_time/date_defs.hpp" -#include "boost/std::shared_ptr.hpp" +#include "boost/shared_ptr.hpp" #include "boost/date_time/compiler_config.hpp" #include <stdexcept> #include <string> @@ -39,7 +39,7 @@ namespace gregorian { using date_time::Dec; using date_time::NotAMonth; using date_time::NumMonths; - + //! Exception thrown if a greg_month is constructed with a value out of range struct bad_month : public std::out_of_range { @@ -50,15 +50,15 @@ namespace gregorian { //! A constrained range that implements the gregorian_month rules typedef CV::constrained_value<greg_month_policies> greg_month_rep; - + //! Wrapper class to represent months in gregorian based calendar class BOOST_DATE_TIME_DECL greg_month : public greg_month_rep { public: typedef date_time::months_of_year month_enum; typedef std::map<std::string, unsigned short> month_map_type; - typedef boost::std::shared_ptr<month_map_type> month_map_ptr_type; + typedef boost::shared_ptr<month_map_type> month_map_ptr_type; //! Construct a month from the months_of_year enumeration - greg_month(month_enum theMonth) : + greg_month(month_enum theMonth) : greg_month_rep(static_cast<greg_month_rep::value_type>(theMonth)) {} //! Construct from a short value greg_month(unsigned short theMonth) : greg_month_rep(theMonth) {} diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/custom_time_zone.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/custom_time_zone.hpp index 1c36d575..84c59a3a 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/custom_time_zone.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/custom_time_zone.hpp @@ -14,7 +14,7 @@ #include "boost/date_time/local_time/dst_transition_day_rules.hpp" #include "boost/date_time/string_convert.hpp" //#include "boost/date_time/special_defs.hpp" -#include "boost/std::shared_ptr.hpp" +#include "boost/shared_ptr.hpp" namespace boost { namespace local_time { @@ -22,7 +22,7 @@ namespace local_time { //typedef boost::date_time::time_zone_names time_zone_names; typedef boost::date_time::dst_adjustment_offsets<boost::posix_time::time_duration> dst_adjustment_offsets; //typedef boost::date_time::time_zone_base<boost::posix_time::ptime> time_zone; - typedef boost::std::shared_ptr<dst_calc_rule> dst_calc_rule_ptr; + typedef boost::shared_ptr<dst_calc_rule> dst_calc_rule_ptr; //! A real time zone template<class CharT> @@ -38,7 +38,7 @@ namespace local_time { custom_time_zone_base(const time_zone_names& zone_names, const time_duration_type& utc_offset, const dst_adjustment_offsets& dst_shift, - boost::std::shared_ptr<dst_calc_rule> calc_rule) : + boost::shared_ptr<dst_calc_rule> calc_rule) : zone_names_(zone_names), base_utc_offset_(utc_offset), dst_offsets_(dst_shift), @@ -100,7 +100,7 @@ namespace local_time { // std offset dst [offset],start[/time],end[/time] - w/o spaces stringstream_type ss; ss.fill('0'); - boost::std::shared_ptr<dst_calc_rule> no_rules; + boost::shared_ptr<dst_calc_rule> no_rules; // std ss << std_zone_abbrev(); // offset @@ -157,7 +157,7 @@ namespace local_time { bool has_dst_; time_duration_type base_utc_offset_; dst_adjustment_offsets dst_offsets_; - boost::std::shared_ptr<dst_calc_rule> dst_calc_rules_; + boost::shared_ptr<dst_calc_rule> dst_calc_rules_; }; typedef custom_time_zone_base<char> custom_time_zone; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/local_date_time.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/local_date_time.hpp index 3eed3eff..96b29158 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/local_date_time.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/local_date_time.hpp @@ -12,7 +12,7 @@ #include <iomanip> #include <sstream> #include <stdexcept> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/throw_exception.hpp> #include <boost/date_time/time.hpp> #include <boost/date_time/posix_time/posix_time.hpp> //todo remove? @@ -57,7 +57,7 @@ namespace local_time { * to wall clock time are made as needed. This approach allows for * operations between wall-clock times in different time zones, and * daylight savings time considerations, to be made. Time zones are - * required to be in the form of a boost::std::shared_ptr<time_zone_base>. + * required to be in the form of a boost::shared_ptr<time_zone_base>. */ template<class utc_time_=posix_time::ptime, class tz_type=date_time::time_zone_base<utc_time_,char> > @@ -79,7 +79,7 @@ namespace local_time { *@param tz Timezone for to adjust the UTC time to. */ local_date_time_base(utc_time_type t, - boost::std::shared_ptr<tz_type> tz) : + boost::shared_ptr<tz_type> tz) : date_time::base_time<utc_time_type, time_system_type>(t), zone_(tz) { @@ -99,12 +99,12 @@ namespace local_time { */ local_date_time_base(date_type d, time_duration_type td, - boost::std::shared_ptr<tz_type> tz, + boost::shared_ptr<tz_type> tz, bool dst_flag) : //necessary for constr_adj() date_time::base_time<utc_time_type,time_system_type>(construction_adjustment(utc_time_type(d, td), tz, dst_flag)), zone_(tz) { - if(tz != boost::std::shared_ptr<tz_type>() && tz->has_dst()){ + if(tz != boost::shared_ptr<tz_type>() && tz->has_dst()){ // d & td are already local so we use them time_is_dst_result result = check_dst(d, td, tz); @@ -140,7 +140,7 @@ namespace local_time { */ local_date_time_base(date_type d, time_duration_type td, - boost::std::shared_ptr<tz_type> tz, + boost::shared_ptr<tz_type> tz, DST_CALC_OPTIONS calc_option) : // dummy value - time_ is set in constructor code date_time::base_time<utc_time_type,time_system_type>(utc_time_type(d,td)), @@ -189,9 +189,9 @@ namespace local_time { */ static time_is_dst_result check_dst(date_type d, time_duration_type td, - boost::std::shared_ptr<tz_type> tz) + boost::shared_ptr<tz_type> tz) { - if(tz != boost::std::shared_ptr<tz_type>() && tz->has_dst()) { + if(tz != boost::shared_ptr<tz_type>() && tz->has_dst()) { typedef typename date_time::dst_calculator<date_type, time_duration_type> dst_calculator; return dst_calculator::local_is_dst( d, td, @@ -218,20 +218,20 @@ namespace local_time { //! Special values constructor explicit local_date_time_base(const boost::date_time::special_values sv, - boost::std::shared_ptr<tz_type> tz = boost::std::shared_ptr<tz_type>()) : + boost::shared_ptr<tz_type> tz = boost::shared_ptr<tz_type>()) : date_time::base_time<utc_time_type, time_system_type>(utc_time_type(sv)), zone_(tz) {} //! returns time zone associated with calling instance - boost::std::shared_ptr<tz_type> zone() const + boost::shared_ptr<tz_type> zone() const { return zone_; } //! returns false is time_zone is NULL and if time value is a special_value bool is_dst() const { - if(zone_ != boost::std::shared_ptr<tz_type>() && zone_->has_dst() && !this->is_special()) { + if(zone_ != boost::shared_ptr<tz_type>() && zone_->has_dst() && !this->is_special()) { // check_dst takes a local time, *this is utc utc_time_type lt(this->time_); lt += zone_->base_utc_offset(); @@ -265,7 +265,7 @@ namespace local_time { //! Returns object's time value as a local representation utc_time_type local_time() const { - if(zone_ != boost::std::shared_ptr<tz_type>()){ + if(zone_ != boost::shared_ptr<tz_type>()){ utc_time_type lt = this->utc_time() + zone_->base_utc_offset(); if (is_dst()) { lt += zone_->dst_offset(); @@ -286,7 +286,7 @@ namespace local_time { ss << utc_time(); return ss.str(); } - if(zone_ == boost::std::shared_ptr<tz_type>()) { + if(zone_ == boost::shared_ptr<tz_type>()) { ss << utc_time() << " UTC"; return ss.str(); } @@ -306,7 +306,7 @@ namespace local_time { } /*! returns a local_date_time_base in the given time zone with the * optional time_duration added. */ - local_date_time_base local_time_in(boost::std::shared_ptr<tz_type> new_tz, + local_date_time_base local_time_in(boost::shared_ptr<tz_type> new_tz, time_duration_type td=time_duration_type(0,0,0)) const { return local_date_time_base(utc_time_type(this->time_) + td, new_tz); @@ -318,7 +318,7 @@ namespace local_time { * classes that do not use a time_zone */ std::string zone_name(bool as_offset=false) const { - if(zone_ == boost::std::shared_ptr<tz_type>()) { + if(zone_ == boost::shared_ptr<tz_type>()) { if(as_offset) { return std::string("Z"); } @@ -352,7 +352,7 @@ namespace local_time { * that do not use a time_zone */ std::string zone_abbrev(bool as_offset=false) const { - if(zone_ == boost::std::shared_ptr<tz_type>()) { + if(zone_ == boost::shared_ptr<tz_type>()) { if(as_offset) { return std::string("Z"); } @@ -384,7 +384,7 @@ namespace local_time { //! returns a posix_time_zone string for the associated time_zone. If no time_zone, "UTC+00" is returned. std::string zone_as_posix_string() const { - if(zone_ == std::shared_ptr<tz_type>()) { + if(zone_ == shared_ptr<tz_type>()) { return std::string("UTC+00"); } return zone_->to_posix_string(); @@ -477,16 +477,16 @@ namespace local_time { return utc_time_type(this->time_) - utc_time_type(rhs.time_); } private: - boost::std::shared_ptr<tz_type> zone_; + boost::shared_ptr<tz_type> zone_; //bool is_dst_; /*! Adjust the passed in time to UTC? */ utc_time_type construction_adjustment(utc_time_type t, - boost::std::shared_ptr<tz_type> z, + boost::shared_ptr<tz_type> z, bool dst_flag) { - if(z != boost::std::shared_ptr<tz_type>()) { + if(z != boost::shared_ptr<tz_type>()) { if(dst_flag && z->has_dst()) { t -= z->dst_offset(); } // else no adjust diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/local_time_types.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/local_time_types.hpp index 30b0540b..5e04422e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/local_time_types.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/local_time_types.hpp @@ -2,7 +2,7 @@ #define LOCAL_TIME_LOCAL_TIME_TYPES_HPP__ /* Copyright (c) 2003-2004 CrystalClear Software, Inc. - * Subject to the Boost Software License, Version 1.0. + * Subject to the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) * Author: Jeff Garland, Bart Garst * $Date: 2008-02-27 12:00:24 -0800 (Wed, 27 Feb 2008) $ @@ -20,21 +20,21 @@ namespace boost { namespace local_time { - typedef boost::date_time::period<local_date_time, + typedef boost::date_time::period<local_date_time, boost::posix_time::time_duration> local_time_period; typedef date_time::time_itr<local_date_time> local_time_iterator; - typedef date_time::second_clock<local_date_time> local_sec_clock; + typedef date_time::second_clock<local_date_time> local_sec_clock; typedef date_time::microsec_clock<local_date_time> local_microsec_clock; - + typedef date_time::time_zone_base<posix_time::ptime, char> time_zone; typedef date_time::time_zone_base<posix_time::ptime, wchar_t> wtime_zone; //! Shared Pointer for custom_time_zone and posix_time_zone objects - typedef boost::std::shared_ptr<time_zone> time_zone_ptr; - typedef boost::std::shared_ptr<wtime_zone> wtime_zone_ptr; - + typedef boost::shared_ptr<time_zone> time_zone_ptr; + typedef boost::shared_ptr<wtime_zone> wtime_zone_ptr; + typedef date_time::time_zone_names_base<char> time_zone_names; typedef date_time::time_zone_names_base<wchar_t> wtime_zone_names; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/posix_time_zone.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/posix_time_zone.hpp index 1d886983..ee1b553e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/posix_time_zone.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/posix_time_zone.hpp @@ -184,7 +184,7 @@ namespace local_time{ // std offset dst [offset],start[/time],end[/time] - w/o spaces stringstream_type ss; ss.fill('0'); - boost::std::shared_ptr<dst_calc_rule> no_rules; + boost::shared_ptr<dst_calc_rule> no_rules; // std ss << std_zone_abbrev(); // offset @@ -241,7 +241,7 @@ namespace local_time{ bool has_dst_; time_duration_type base_utc_offset_; dst_adjustment_offsets dst_offsets_; - boost::std::shared_ptr<dst_calc_rule> dst_calc_rules_; + boost::shared_ptr<dst_calc_rule> dst_calc_rules_; /*! Extract time zone abbreviations for STD & DST as well * as the offsets for the time shift that occurs and how @@ -399,7 +399,7 @@ namespace local_time{ ew = lexical_cast<unsigned short>(*it++); ed = lexical_cast<unsigned short>(*it); - dst_calc_rules_ = std::shared_ptr<dst_calc_rule>( + dst_calc_rules_ = shared_ptr<dst_calc_rule>( new nth_kday_dst_rule( nth_last_dst_rule::start_rule( static_cast<nkday::week_num>(sw),sd,sm), @@ -427,7 +427,7 @@ namespace local_time{ ed -= calendar::end_of_month_day(year,em++); } - dst_calc_rules_ = std::shared_ptr<dst_calc_rule>( + dst_calc_rules_ = shared_ptr<dst_calc_rule>( new partial_date_dst_rule( partial_date_dst_rule::start_rule( sd, static_cast<date_time::months_of_year>(sm)), @@ -443,7 +443,7 @@ namespace local_time{ int sd=0, ed=0; sd = lexical_cast<int>(s); ed = lexical_cast<int>(e); - dst_calc_rules_ = std::shared_ptr<dst_calc_rule>( + dst_calc_rules_ = shared_ptr<dst_calc_rule>( new partial_date_dst_rule( partial_date_dst_rule::start_rule(++sd),// args are 0-365 partial_date_dst_rule::end_rule(++ed) // pd expects 1-366 diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/tz_database.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/tz_database.hpp index 26afe449..aceda939 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/tz_database.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/local_time/tz_database.hpp @@ -2,7 +2,7 @@ #define BOOST_DATE_TIME_TZ_DATABASE_HPP__ /* Copyright (c) 2003-2004 CrystalClear Software, Inc. - * Subject to the Boost Software License, Version 1.0. + * Subject to the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) * Author: Jeff Garland, Bart Garst * $Date: 2008-02-27 12:00:24 -0800 (Wed, 27 Feb 2008) $ @@ -17,11 +17,11 @@ namespace boost { namespace local_time { - using date_time::data_not_accessible; - using date_time::bad_field_count; + using date_time::data_not_accessible; + using date_time::bad_field_count; - //! Object populated with boost::std::shared_ptr<time_zone_base> objects - /*! Object populated with boost::std::shared_ptr<time_zone_base> objects + //! Object populated with boost::shared_ptr<time_zone_base> objects + /*! Object populated with boost::shared_ptr<time_zone_base> objects * Database is populated from specs stored in external csv file. See * date_time::tz_db_base for greater detail */ typedef date_time::tz_db_base<custom_time_zone, nth_kday_dst_rule> tz_database; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/microsec_time_clock.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/microsec_time_clock.hpp index beb1d70d..177811ee 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/microsec_time_clock.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/microsec_time_clock.hpp @@ -15,7 +15,7 @@ */ #include <boost/cstdint.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/detail/workaround.hpp> #include <boost/date_time/compiler_config.hpp> #include <boost/date_time/c_time.hpp> @@ -50,7 +50,7 @@ namespace date_time { //! return a local time object for the given zone, based on computer clock //JKG -- looks like we could rewrite this against universal_time template<class time_zone_type> - static time_type local_time(std::shared_ptr<time_zone_type> tz_ptr) + static time_type local_time(shared_ptr<time_zone_type> tz_ptr) { typedef typename time_type::utc_time_type utc_time_type; typedef second_clock<utc_time_type> second_clock; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/time_clock.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/time_clock.hpp index c73466ed..9aa2ff0e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/time_clock.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/time_clock.hpp @@ -14,7 +14,7 @@ */ #include "boost/date_time/c_time.hpp" -#include "boost/std::shared_ptr.hpp" +#include "boost/shared_ptr.hpp" namespace boost { namespace date_time { @@ -54,7 +54,7 @@ namespace date_time { } template<class time_zone_type> - static time_type local_time(boost::std::shared_ptr<time_zone_type> tz_ptr) + static time_type local_time(boost::shared_ptr<time_zone_type> tz_ptr) { typedef typename time_type::utc_time_type utc_time_type; utc_time_type utc_time = second_clock<utc_time_type>::universal_time(); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/tz_db_base.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/tz_db_base.hpp index fff9f91e..a6d8ea9e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/tz_db_base.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/date_time/tz_db_base.hpp @@ -2,7 +2,7 @@ #define DATE_TIME_TZ_DB_BASE_HPP__ /* Copyright (c) 2003-2005 CrystalClear Software, Inc. - * Subject to the Boost Software License, Version 1.0. + * Subject to the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) * Author: Jeff Garland, Bart Garst * $Date: 2012-09-22 09:04:10 -0700 (Sat, 22 Sep 2012) $ @@ -15,7 +15,7 @@ #include <fstream> #include <stdexcept> #include <boost/tokenizer.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/throw_exception.hpp> #include <boost/date_time/compiler_config.hpp> #include <boost/date_time/time_zone_names.hpp> @@ -29,20 +29,20 @@ namespace boost { class data_not_accessible : public std::logic_error { public: - data_not_accessible() : - std::logic_error(std::string("Unable to locate or access the required datafile.")) + data_not_accessible() : + std::logic_error(std::string("Unable to locate or access the required datafile.")) {} - data_not_accessible(const std::string& filespec) : - std::logic_error(std::string("Unable to locate or access the required datafile. Filespec: " + filespec)) + data_not_accessible(const std::string& filespec) : + std::logic_error(std::string("Unable to locate or access the required datafile. Filespec: " + filespec)) {} }; - + //! Exception thrown when tz database locates incorrect field structure in data file class bad_field_count : public std::out_of_range { public: - bad_field_count(const std::string& s) : - std::out_of_range(s) + bad_field_count(const std::string& s) : + std::out_of_range(s) {} }; @@ -51,48 +51,48 @@ namespace boost { * tz_db_base is intended to be customized by the * library user. When customizing this file (or creating your own) the * file must follow a specific format. - * + * * This first line is expected to contain column headings and is therefore * not processed by the tz_db_base. * * Each record (line) must have eleven fields. Some of those fields can - * be empty. Every field (even empty ones) must be enclosed in + * be empty. Every field (even empty ones) must be enclosed in * double-quotes. * Ex: * @code * "America/Phoenix" <- string enclosed in quotes * "" <- empty field * @endcode - * - * Some fields represent a length of time. The format of these fields + * + * Some fields represent a length of time. The format of these fields * must be: * @code * "{+|-}hh:mm[:ss]" <- length-of-time format * @endcode * Where the plus or minus is mandatory and the seconds are optional. - * - * Since some time zones do not use daylight savings it is not always - * necessary for every field in a zone_spec to contain a value. All - * zone_specs must have at least ID and GMT offset. Zones that use - * daylight savings must have all fields filled except: - * STD ABBR, STD NAME, DST NAME. You should take note - * that DST ABBR is mandatory for zones that use daylight savings + * + * Since some time zones do not use daylight savings it is not always + * necessary for every field in a zone_spec to contain a value. All + * zone_specs must have at least ID and GMT offset. Zones that use + * daylight savings must have all fields filled except: + * STD ABBR, STD NAME, DST NAME. You should take note + * that DST ABBR is mandatory for zones that use daylight savings * (see field descriptions for further details). * - * ******* Fields and their description/details ********* - * - * ID: + * ******* Fields and their description/details ********* + * + * ID: * Contains the identifying string for the zone_spec. Any string will - * do as long as it's unique. No two ID's can be the same. + * do as long as it's unique. No two ID's can be the same. * * STD ABBR: * STD NAME: * DST ABBR: * DST NAME: - * These four are all the names and abbreviations used by the time - * zone being described. While any string will do in these fields, - * care should be taken. These fields hold the strings that will be - * used in the output of many of the local_time classes. + * These four are all the names and abbreviations used by the time + * zone being described. While any string will do in these fields, + * care should be taken. These fields hold the strings that will be + * used in the output of many of the local_time classes. * Ex: * @code * time_zone nyc = tz_db.time_zone_from_region("America/New_York"); @@ -103,42 +103,42 @@ namespace boost { * // 2004-Aug-30 00:00:00 EDT * @endcode * - * NOTE: The exact format/function names may vary - see local_time + * NOTE: The exact format/function names may vary - see local_time * documentation for further details. * * GMT offset: - * This is the number of hours added to utc to get the local time - * before any daylight savings adjustments are made. Some examples + * This is the number of hours added to utc to get the local time + * before any daylight savings adjustments are made. Some examples * are: America/New_York offset -5 hours, & Africa/Cairo offset +2 hours. * The format must follow the length-of-time format described above. * * DST adjustment: - * The amount of time added to gmt_offset when daylight savings is in + * The amount of time added to gmt_offset when daylight savings is in * effect. The format must follow the length-of-time format described * above. * * DST Start Date rule: * This is a specially formatted string that describes the day of year * in which the transition take place. It holds three fields of it's own, - * separated by semicolons. - * The first field indicates the "nth" weekday of the month. The possible - * values are: 1 (first), 2 (second), 3 (third), 4 (fourth), 5 (fifth), + * separated by semicolons. + * The first field indicates the "nth" weekday of the month. The possible + * values are: 1 (first), 2 (second), 3 (third), 4 (fourth), 5 (fifth), * and -1 (last). * The second field indicates the day-of-week from 0-6 (Sun=0). * The third field indicates the month from 1-12 (Jan=1). - * - * Examples are: "-1;5;9"="Last Friday of September", + * + * Examples are: "-1;5;9"="Last Friday of September", * "2;1;3"="Second Monday of March" * * Start time: * Start time is the number of hours past midnight, on the day of the - * start transition, the transition takes place. More simply put, the + * start transition, the transition takes place. More simply put, the * time of day the transition is made (in 24 hours format). The format - * must follow the length-of-time format described above with the + * must follow the length-of-time format described above with the * exception that it must always be positive. * * DST End date rule: - * See DST Start date rule. The difference here is this is the day + * See DST Start date rule. The difference here is this is the day * daylight savings ends (transition to STD). * * End time: @@ -147,13 +147,13 @@ namespace boost { template<class time_zone_type, class rule_type> class tz_db_base { public: - /* Having CharT as a template parameter created problems - * with posix_time::duration_from_string. Templatizing - * duration_from_string was not possible at this time, however, - * it should be possible in the future (when poor compilers get - * fixed or stop being used). - * Since this class was designed to use CharT as a parameter it - * is simply typedef'd here to ease converting in back to a + /* Having CharT as a template parameter created problems + * with posix_time::duration_from_string. Templatizing + * duration_from_string was not possible at this time, however, + * it should be possible in the future (when poor compilers get + * fixed or stop being used). + * Since this class was designed to use CharT as a parameter it + * is simply typedef'd here to ease converting in back to a * parameter the future */ typedef char char_type; @@ -182,7 +182,7 @@ namespace boost { { string_type in_str; std::string buff; - + std::ifstream ifs(pathspec.c_str()); if(!ifs){ boost::throw_exception(data_not_accessible(pathspec)); @@ -192,27 +192,27 @@ namespace boost { } //! returns true if record successfully added to map - /*! Takes a region name in the form of "America/Phoenix", and a - * time_zone object for that region. The id string must be a unique + /*! Takes a region name in the form of "America/Phoenix", and a + * time_zone object for that region. The id string must be a unique * name that does not already exist in the database. */ - bool add_record(const string_type& region, - boost::std::shared_ptr<time_zone_base_type> tz) + bool add_record(const string_type& region, + boost::shared_ptr<time_zone_base_type> tz) { - typename map_type::value_type p(region, tz); + typename map_type::value_type p(region, tz); return (m_zone_map.insert(p)).second; } //! Returns a time_zone object built from the specs for the given region - /*! Returns a time_zone object built from the specs for the given - * region. If region does not exist a local_time::record_not_found + /*! Returns a time_zone object built from the specs for the given + * region. If region does not exist a local_time::record_not_found * exception will be thrown */ - boost::std::shared_ptr<time_zone_base_type> - time_zone_from_region(const string_type& region) const + boost::shared_ptr<time_zone_base_type> + time_zone_from_region(const string_type& region) const { // get the record typename map_type::const_iterator record = m_zone_map.find(region); if(record == m_zone_map.end()){ - return boost::std::shared_ptr<time_zone_base_type>(); //null pointer + return boost::shared_ptr<time_zone_base_type>(); //null pointer } return record->second; } @@ -229,9 +229,9 @@ namespace boost { } return regions; } - + private: - typedef std::map<string_type, boost::std::shared_ptr<time_zone_base_type> > map_type; + typedef std::map<string_type, boost::shared_ptr<time_zone_base_type> > map_type; map_type m_zone_map; // start and end rule are of the same type @@ -240,27 +240,27 @@ namespace boost { /* TODO: mechanisms need to be put in place to handle different * types of rule specs. parse_rules() only handles nth_kday * rule types. */ - + //! parses rule specs for transition day rules rule_type* parse_rules(const string_type& sr, const string_type& er) const { using namespace gregorian; - // start and end rule are of the same type, + // start and end rule are of the same type, // both are included here for readability typedef typename rule_type::start_rule start_rule; typedef typename rule_type::end_rule end_rule; - + // these are: [start|end] nth, day, month int s_nth = 0, s_d = 0, s_m = 0; int e_nth = 0, e_d = 0, e_m = 0; split_rule_spec(s_nth, s_d, s_m, sr); split_rule_spec(e_nth, e_d, e_m, er); - + typename start_rule::week_num s_wn, e_wn; s_wn = get_week_num(s_nth); e_wn = get_week_num(e_nth); - - + + return new rule_type(start_rule(s_wn, s_d, s_m), end_rule(e_wn, e_d, e_m)); } @@ -286,7 +286,7 @@ namespace boost { } return start_rule::fifth; // silence warnings } - + //! splits the [start|end]_date_rule string into 3 ints void split_rule_spec(int& nth, int& d, int& m, string_type rule) const { @@ -297,22 +297,22 @@ namespace boost { typedef boost::tokenizer<char_separator_type, std::basic_string<char_type>::const_iterator, std::basic_string<char_type> >::iterator tokenizer_iterator; - + const char_type sep_char[] = { ';', '\0'}; char_separator_type sep(sep_char); tokenizer tokens(rule, sep); // 3 fields - - tokenizer_iterator tok_iter = tokens.begin(); + + tokenizer_iterator tok_iter = tokens.begin(); nth = std::atoi(tok_iter->c_str()); ++tok_iter; d = std::atoi(tok_iter->c_str()); ++tok_iter; m = std::atoi(tok_iter->c_str()); } - + //! Take a line from the csv, turn it into a time_zone_type. /*! Take a line from the csv, turn it into a time_zone_type, - * and add it to the map. Zone_specs in csv file are expected to - * have eleven fields that describe the time zone. Returns true if + * and add it to the map. Zone_specs in csv file are expected to + * have eleven fields that describe the time zone. Returns true if * zone_spec successfully added to database */ bool parse_string(string_type& s) { @@ -333,16 +333,16 @@ namespace boost { //take a shot at fixing gcc 4.x error const unsigned int expected_fields = static_cast<unsigned int>(FIELD_COUNT); - if (result.size() != expected_fields) { + if (result.size() != expected_fields) { std::ostringstream msg; - msg << "Expecting " << FIELD_COUNT << " fields, got " + msg << "Expecting " << FIELD_COUNT << " fields, got " << result.size() << " fields in line: " << s; boost::throw_exception(bad_field_count(msg.str())); BOOST_DATE_TIME_UNREACHABLE_EXPRESSION(return false); // should never reach } // initializations - bool has_dst = true; + bool has_dst = true; if(result[DSTABBR] == std::string()){ has_dst = false; } @@ -352,14 +352,14 @@ namespace boost { time_zone_names names(result[STDNAME], result[STDABBR], result[DSTNAME], result[DSTABBR]); - time_duration_type utc_offset = + time_duration_type utc_offset = str_from_delimited_time_duration<time_duration_type,char_type>(result[GMTOFFSET]); - + dst_adjustment_offsets adjust(time_duration_type(0,0,0), time_duration_type(0,0,0), time_duration_type(0,0,0)); - boost::std::shared_ptr<rule_type> rules; + boost::shared_ptr<rule_type> rules; if(has_dst){ adjust = dst_adjustment_offsets( @@ -368,16 +368,16 @@ namespace boost { str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME]) ); - rules = - boost::std::shared_ptr<rule_type>(parse_rules(result[START_DATE_RULE], + rules = + boost::shared_ptr<rule_type>(parse_rules(result[START_DATE_RULE], result[END_DATE_RULE])); } string_type id(result[ID]); - boost::std::shared_ptr<time_zone_base_type> zone(new time_zone_type(names, utc_offset, adjust, rules)); + boost::shared_ptr<time_zone_base_type> zone(new time_zone_type(names, utc_offset, adjust, rules)); return (add_record(id, zone)); - - } - + + } + }; } } // namespace diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/detail/exception_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/detail/exception_ptr.hpp index 283cdad4..5e5a2679 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/detail/exception_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/detail/exception_ptr.hpp @@ -21,7 +21,7 @@ #include <boost/exception/diagnostic_information.hpp> #include <boost/exception/detail/type_info.hpp> #include <boost/exception/detail/clone_current_exception.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <stdexcept> #include <new> #include <ios> @@ -37,7 +37,7 @@ boost class exception_ptr { - typedef boost::std::shared_ptr<exception_detail::clone_base const> impl; + typedef boost::shared_ptr<exception_detail::clone_base const> impl; impl ptr_; friend void rethrow_exception( exception_ptr const & ); typedef exception_detail::clone_base const * (impl::*unspecified_bool_type)() const; @@ -122,7 +122,7 @@ boost throw_function(BOOST_CURRENT_FUNCTION) << throw_file(__FILE__) << throw_line(__LINE__); - static exception_ptr ep(std::shared_ptr<exception_detail::clone_base const>(new exception_detail::clone_impl<Exception>(c))); + static exception_ptr ep(shared_ptr<exception_detail::clone_base const>(new exception_detail::clone_impl<Exception>(c))); return ep; } @@ -305,7 +305,7 @@ boost success: { BOOST_ASSERT(e!=0); - return exception_ptr(std::shared_ptr<exception_detail::clone_base const>(e)); + return exception_ptr(shared_ptr<exception_detail::clone_base const>(e)); } case exception_detail::clone_current_exception_result:: bad_alloc: @@ -332,7 +332,7 @@ boost catch( exception_detail::clone_base & e ) { - return exception_ptr(std::shared_ptr<exception_detail::clone_base const>(e.clone())); + return exception_ptr(shared_ptr<exception_detail::clone_base const>(e.clone())); } catch( std::domain_error & e ) diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/exception.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/exception.hpp index 6cd51f88..42d27871 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/exception.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/exception.hpp @@ -145,7 +145,7 @@ boost #endif template <class T> - class std::shared_ptr; + class shared_ptr; namespace exception_detail @@ -157,8 +157,8 @@ boost error_info_container { virtual char const * diagnostic_information( char const * ) const = 0; - virtual std::shared_ptr<error_info_base> get( type_info_ const & ) const = 0; - virtual void set( std::shared_ptr<error_info_base> const &, type_info_ const & ) = 0; + virtual shared_ptr<error_info_base> get( type_info_ const & ) const = 0; + virtual void set( shared_ptr<error_info_base> const &, type_info_ const & ) = 0; virtual void add_ref() const = 0; virtual bool release() const = 0; virtual refcount_ptr<exception_detail::error_info_container> clone() const = 0; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/get_error_info.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/get_error_info.hpp index e9b7ce8d..046f05ae 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/get_error_info.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/get_error_info.hpp @@ -15,7 +15,7 @@ #include <boost/exception/exception.hpp> #include <boost/exception/detail/error_info_impl.hpp> #include <boost/exception/detail/type_info.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> namespace boost @@ -32,7 +32,7 @@ boost get( exception const & x ) { if( exception_detail::error_info_container * c=x.data_.get() ) - if( std::shared_ptr<exception_detail::error_info_base> eib = c->get(BOOST_EXCEPTION_STATIC_TYPEID(ErrorInfo)) ) + if( shared_ptr<exception_detail::error_info_base> eib = c->get(BOOST_EXCEPTION_STATIC_TYPEID(ErrorInfo)) ) { #ifndef BOOST_NO_RTTI BOOST_ASSERT( 0!=dynamic_cast<ErrorInfo *>(eib.get()) ); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/info.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/info.hpp index bae6ffcf..7b56076d 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/info.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/exception/info.hpp @@ -15,7 +15,7 @@ #include <boost/exception/exception.hpp> #include <boost/exception/to_string_stub.hpp> #include <boost/exception/detail/error_info_impl.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/config.hpp> #include <map> @@ -82,26 +82,26 @@ boost } void - set( std::shared_ptr<error_info_base> const & x, type_info_ const & typeid_ ) + set( shared_ptr<error_info_base> const & x, type_info_ const & typeid_ ) { BOOST_ASSERT(x); info_[typeid_] = x; diagnostic_info_str_.clear(); } - std::shared_ptr<error_info_base> + shared_ptr<error_info_base> get( type_info_ const & ti ) const { error_info_map::const_iterator i=info_.find(ti); if( info_.end()!=i ) { - std::shared_ptr<error_info_base> const & p = i->second; + shared_ptr<error_info_base> const & p = i->second; #ifndef BOOST_NO_RTTI BOOST_ASSERT( *BOOST_EXCEPTION_DYNAMIC_TYPEID(*p).type_==*ti.type_ ); #endif return p; } - return std::shared_ptr<error_info_base>(); + return shared_ptr<error_info_base>(); } char const * @@ -125,7 +125,7 @@ boost friend class boost::exception; - typedef std::map< type_info_, std::shared_ptr<error_info_base> > error_info_map; + typedef std::map< type_info_, shared_ptr<error_info_base> > error_info_map; error_info_map info_; mutable std::string diagnostic_info_str_; mutable int count_; @@ -168,7 +168,7 @@ boost set_info( E const & x, error_info<Tag,T> const & v ) { typedef error_info<Tag,T> error_info_tag_t; - std::shared_ptr<error_info_tag_t> p( new error_info_tag_t(v) ); + shared_ptr<error_info_tag_t> p( new error_info_tag_t(v) ); exception_detail::error_info_container * c=x.data_.get(); if( !c ) x.data_.adopt(c=new exception_detail::error_info_container_impl); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/filesystem/operations.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/filesystem/operations.hpp index 43749ff9..dc01b7d8 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/filesystem/operations.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/filesystem/operations.hpp @@ -2,9 +2,9 @@ // Copyright Beman Dawes 2002-2009 // Copyright Jan Langer 2002 -// Copyright Dietmar Kuehl 2001 +// Copyright Dietmar Kuehl 2001 // Copyright Vladimir Prus 2002 - + // Distributed under the Boost Software License, Version 1.0. // See http://www.boost.org/LICENSE_1_0.txt @@ -28,7 +28,7 @@ #include <boost/detail/bitmask.hpp> #include <boost/system/error_code.hpp> #include <boost/system/system_error.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/utility/enable_if.hpp> #include <boost/type_traits/is_same.hpp> #include <boost/iterator.hpp> @@ -59,7 +59,7 @@ namespace boost //--------------------------------------------------------------------------------------// enum file_type - { + { status_error, # ifndef BOOST_FILESYSTEM_NO_DEPRECATED status_unknown = status_error, @@ -92,7 +92,7 @@ namespace boost // Values are from POSIX and are given in octal per the POSIX standard. // permission bits - + owner_read = 0400, // S_IRUSR, Read permission, owner owner_write = 0200, // S_IWUSR, Write permission, owner owner_exe = 0100, // S_IXUSR, Execute/search permission, owner @@ -115,8 +115,8 @@ namespace boost set_uid_on_exe = 04000, // S_ISUID, Set-user-ID on execution set_gid_on_exe = 02000, // S_ISGID, Set-group-ID on execution sticky_bit = 01000, // S_ISVTX, - // (POSIX XSI) On directories, restricted deletion flag - // (V7) 'sticky bit': save swapped text even after use + // (POSIX XSI) On directories, restricted deletion flag + // (V7) 'sticky bit': save swapped text even after use // (SunOS) On non-directories: don't cache this file // (SVID-v4.2) On directories: restricted deletion flag // Also see http://en.wikipedia.org/wiki/Sticky_bit @@ -151,13 +151,13 @@ namespace boost // observers file_type type() const { return m_value; } - perms permissions() const { return m_perms; } + perms permissions() const { return m_perms; } // modifiers void type(file_type v) { m_value = v; } void permissions(perms prms) { m_perms = prms; } - bool operator==(const file_status& rhs) const { return type() == rhs.type() && + bool operator==(const file_status& rhs) const { return type() == rhs.type() && permissions() == rhs.permissions(); } bool operator!=(const file_status& rhs) const { return !(*this == rhs); } @@ -260,7 +260,7 @@ namespace boost BOOST_FILESYSTEM_DECL void resize_file(const path& p, uintmax_t size, system::error_code* ec=0); BOOST_FILESYSTEM_DECL - space_info space(const path& p, system::error_code* ec=0); + space_info space(const path& p, system::error_code* ec=0); BOOST_FILESYSTEM_DECL path system_complete(const path& p, system::error_code* ec=0); BOOST_FILESYSTEM_DECL @@ -277,37 +277,37 @@ namespace boost inline file_status status(const path& p) {return detail::status(p);} - inline + inline file_status status(const path& p, system::error_code& ec) {return detail::status(p, &ec);} - inline + inline file_status symlink_status(const path& p) {return detail::symlink_status(p);} inline file_status symlink_status(const path& p, system::error_code& ec) {return detail::symlink_status(p, &ec);} - inline + inline bool exists(const path& p) {return exists(detail::status(p));} - inline + inline bool exists(const path& p, system::error_code& ec) {return exists(detail::status(p, &ec));} - inline + inline bool is_directory(const path& p) {return is_directory(detail::status(p));} - inline + inline bool is_directory(const path& p, system::error_code& ec) {return is_directory(detail::status(p, &ec));} - inline + inline bool is_regular_file(const path& p) {return is_regular_file(detail::status(p));} - inline + inline bool is_regular_file(const path& p, system::error_code& ec) {return is_regular_file(detail::status(p, &ec));} - inline + inline bool is_other(const path& p) {return is_other(detail::status(p));} - inline + inline bool is_other(const path& p, system::error_code& ec) {return is_other(detail::status(p, &ec));} inline bool is_symlink(const path& p) {return is_symlink(detail::symlink_status(p));} - inline + inline bool is_symlink(const path& p, system::error_code& ec) {return is_symlink(detail::symlink_status(p, &ec));} # ifndef BOOST_FILESYSTEM_NO_DEPRECATED @@ -330,7 +330,7 @@ namespace boost // in alphabetical order, unless otherwise noted // // // //--------------------------------------------------------------------------------------// - + // forward declarations path current_path(); // fwd declaration path initial_path(); @@ -367,7 +367,7 @@ namespace boost void copy(const path& from, const path& to) {detail::copy(from, to);} inline - void copy(const path& from, const path& to, system::error_code& ec) + void copy(const path& from, const path& to, system::error_code& ec) {detail::copy(from, to, &ec);} inline void copy_directory(const path& from, const path& to) @@ -500,7 +500,7 @@ namespace boost inline boost::uintmax_t remove_all(const path& p) {return detail::remove_all(p);} - + inline boost::uintmax_t remove_all(const path& p, system::error_code& ec) {return detail::remove_all(p, &ec);} @@ -517,10 +517,10 @@ namespace boost void resize_file(const path& p, uintmax_t size, system::error_code& ec) {detail::resize_file(p, size, &ec);} inline - space_info space(const path& p) {return detail::space(p);} + space_info space(const path& p) {return detail::space(p);} inline - space_info space(const path& p, system::error_code& ec) {return detail::space(p, &ec);} + space_info space(const path& p, system::error_code& ec) {return detail::space(p, &ec);} # ifndef BOOST_FILESYSTEM_NO_DEPRECATED inline bool symbolic_link_exists(const path& p) @@ -537,7 +537,7 @@ namespace boost path temp_directory_path() {return detail::temp_directory_path();} inline - path temp_directory_path(system::error_code& ec) + path temp_directory_path(system::error_code& ec) {return detail::temp_directory_path(&ec);} inline path unique_path(const path& p="%%%%-%%%%-%%%%-%%%%") @@ -552,7 +552,7 @@ namespace boost // // //--------------------------------------------------------------------------------------// -// GCC has a problem with a member function named path within a namespace or +// GCC has a problem with a member function named path within a namespace or // sub-namespace that also has a class named path. The workaround is to always // fully qualify the name path when it refers to the class name. @@ -593,12 +593,12 @@ public: file_status symlink_status() const {return m_get_symlink_status();} file_status symlink_status(system::error_code& ec) const {return m_get_symlink_status(&ec);} - bool operator==(const directory_entry& rhs) {return m_path == rhs.m_path;} - bool operator!=(const directory_entry& rhs) {return m_path != rhs.m_path;} - bool operator< (const directory_entry& rhs) {return m_path < rhs.m_path;} - bool operator<=(const directory_entry& rhs) {return m_path <= rhs.m_path;} - bool operator> (const directory_entry& rhs) {return m_path > rhs.m_path;} - bool operator>=(const directory_entry& rhs) {return m_path >= rhs.m_path;} + bool operator==(const directory_entry& rhs) {return m_path == rhs.m_path;} + bool operator!=(const directory_entry& rhs) {return m_path != rhs.m_path;} + bool operator< (const directory_entry& rhs) {return m_path < rhs.m_path;} + bool operator<=(const directory_entry& rhs) {return m_path <= rhs.m_path;} + bool operator> (const directory_entry& rhs) {return m_path > rhs.m_path;} + bool operator>=(const directory_entry& rhs) {return m_path >= rhs.m_path;} private: boost::filesystem::path m_path; @@ -625,7 +625,7 @@ namespace detail # if defined(BOOST_POSIX_API) , void *& buffer # endif - ); + ); struct dir_itr_imp { @@ -688,7 +688,7 @@ namespace detail ~directory_iterator() {} // never throws directory_iterator& increment(system::error_code& ec) - { + { detail::directory_iterator_increment(*this, &ec); return *this; } @@ -700,16 +700,16 @@ namespace detail friend BOOST_FILESYSTEM_DECL void detail::directory_iterator_increment(directory_iterator& it, system::error_code* ec); - // std::shared_ptr provides shallow-copy semantics required for InputIterators. + // shared_ptr provides shallow-copy semantics required for InputIterators. // m_imp.get()==0 indicates the end iterator. - boost::std::shared_ptr< detail::dir_itr_imp > m_imp; + boost::shared_ptr< detail::dir_itr_imp > m_imp; friend class boost::iterator_core_access; boost::iterator_facade< directory_iterator, directory_entry, - boost::single_pass_traversal_tag >::reference dereference() const + boost::single_pass_traversal_tag >::reference dereference() const { BOOST_ASSERT_MSG(m_imp.get(), "attempt to dereference end iterator"); return m_imp->dir_entry; @@ -884,7 +884,7 @@ namespace detail } int level() const - { + { BOOST_ASSERT_MSG(m_imp.get(), "level() on end recursive_directory_iterator"); return m_imp->m_level; @@ -903,7 +903,7 @@ namespace detail # endif void pop() - { + { BOOST_ASSERT_MSG(m_imp.get(), "pop() on end recursive_directory_iterator"); m_imp->pop(); @@ -936,17 +936,17 @@ namespace detail private: - // std::shared_ptr provides shallow-copy semantics required for InputIterators. + // shared_ptr provides shallow-copy semantics required for InputIterators. // m_imp.get()==0 indicates the end iterator. - boost::std::shared_ptr< detail::recur_dir_itr_imp > m_imp; + boost::shared_ptr< detail::recur_dir_itr_imp > m_imp; friend class boost::iterator_core_access; - boost::iterator_facade< + boost::iterator_facade< recursive_directory_iterator, directory_entry, boost::single_pass_traversal_tag >::reference - dereference() const + dereference() const { BOOST_ASSERT_MSG(m_imp.get(), "dereference of end recursive_directory_iterator"); @@ -954,7 +954,7 @@ namespace detail } void increment() - { + { BOOST_ASSERT_MSG(m_imp.get(), "increment of end recursive_directory_iterator"); m_imp->increment(0); @@ -976,7 +976,7 @@ namespace detail // class filesystem_error // // // //--------------------------------------------------------------------------------------// - + class BOOST_SYMBOL_VISIBLE filesystem_error : public system::system_error { // see http://www.boost.org/more/error_handling.html for design rationale @@ -1009,7 +1009,7 @@ namespace detail } catch (...) { m_imp_ptr.reset(); } } - + filesystem_error( const std::string & what_arg, const path& path1_arg, const path& path2_arg, system::error_code ec) @@ -1075,7 +1075,7 @@ namespace detail path m_path2; // may be empty() std::string m_what; // not built until needed }; - boost::std::shared_ptr<m_imp> m_imp_ptr; + boost::shared_ptr<m_imp> m_imp_ptr; }; // test helper -----------------------------------------------------------------------// diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/filesystem/path.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/filesystem/path.hpp index 90aff04b..2dd1b00e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/filesystem/path.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/filesystem/path.hpp @@ -26,7 +26,7 @@ #include <boost/system/error_code.hpp> #include <boost/system/system_error.hpp> #include <boost/iterator/iterator_facade.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/io/detail/quoted_manip.hpp> #include <boost/static_assert.hpp> #include <boost/functional/hash_fwd.hpp> @@ -62,11 +62,11 @@ namespace filesystem # ifdef BOOST_WINDOWS_API typedef wchar_t value_type; BOOST_STATIC_CONSTEXPR value_type preferred_separator = L'\\'; -# else +# else typedef char value_type; BOOST_STATIC_CONSTEXPR value_type preferred_separator = '/'; # endif - typedef std::basic_string<value_type> string_type; + typedef std::basic_string<value_type> string_type; typedef std::codecvt<wchar_t, char, std::mbstate_t> codecvt_type; @@ -89,7 +89,7 @@ namespace filesystem // // The path locale, which is global to the thread, can be changed by the // imbue() function. It is initialized to an implementation defined locale. - // + // // For Windows, wchar_t strings do not undergo conversion. char strings // are converted using the "ANSI" or "OEM" code pages, as determined by // the AreFileApisANSI() function, or, if a conversion argument is given, @@ -98,7 +98,7 @@ namespace filesystem // See m_pathname comments for further important rationale. // TODO: rules needed for operating systems that use / or . - // differently, or format directory paths differently from file paths. + // differently, or format directory paths differently from file paths. // // ********************************************************************************** // @@ -127,7 +127,7 @@ namespace filesystem // ----- constructors ----- - path(){} + path(){} path(const path& p) : m_pathname(p.m_pathname) {} @@ -159,7 +159,7 @@ namespace filesystem template <class InputIterator> path(InputIterator begin, InputIterator end) - { + { if (begin != end) { std::basic_string<typename std::iterator_traits<InputIterator>::value_type> @@ -170,7 +170,7 @@ namespace filesystem template <class InputIterator> path(InputIterator begin, InputIterator end, const codecvt_type& cvt) - { + { if (begin != end) { std::basic_string<typename std::iterator_traits<InputIterator>::value_type> @@ -225,7 +225,7 @@ namespace filesystem template <class InputIterator> path& assign(InputIterator begin, InputIterator end, const codecvt_type& cvt) - { + { m_pathname.clear(); if (begin != end) { @@ -270,13 +270,13 @@ namespace filesystem template <class InputIterator> path& concat(InputIterator begin, InputIterator end) - { + { return concat(begin, end, codecvt()); } template <class InputIterator> path& concat(InputIterator begin, InputIterator end, const codecvt_type& cvt) - { + { if (begin == end) return *this; std::basic_string<typename std::iterator_traits<InputIterator>::value_type> @@ -313,7 +313,7 @@ namespace filesystem template <class InputIterator> path& append(InputIterator begin, InputIterator end) - { + { return append(begin, end, codecvt()); } @@ -334,7 +334,7 @@ namespace filesystem void swap(path& rhs) { m_pathname.swap(rhs.m_pathname); } // ----- observers ----- - + // For operating systems that format file paths differently than directory // paths, return values from observers are formatted as file names unless there // is a trailing separator, in which case returns are formatted as directory @@ -364,16 +364,16 @@ namespace filesystem String string(const codecvt_type& cvt) const; # ifdef BOOST_WINDOWS_API - const std::string string() const { return string(codecvt()); } + const std::string string() const { return string(codecvt()); } const std::string string(const codecvt_type& cvt) const - { + { std::string tmp; if (!m_pathname.empty()) path_traits::convert(&*m_pathname.begin(), &*m_pathname.begin()+m_pathname.size(), tmp, cvt); return tmp; } - + // string_type is std::wstring, so there is no conversion const std::wstring& wstring() const { return m_pathname; } const std::wstring& wstring(const codecvt_type&) const { return m_pathname; } @@ -385,7 +385,7 @@ namespace filesystem const std::wstring wstring() const { return wstring(codecvt()); } const std::wstring wstring(const codecvt_type& cvt) const - { + { std::wstring tmp; if (!m_pathname.empty()) path_traits::convert(&*m_pathname.begin(), &*m_pathname.begin()+m_pathname.size(), @@ -404,8 +404,8 @@ namespace filesystem String generic_string(const codecvt_type& cvt) const; # ifdef BOOST_WINDOWS_API - const std::string generic_string() const { return generic_string(codecvt()); } - const std::string generic_string(const codecvt_type& cvt) const; + const std::string generic_string() const { return generic_string(codecvt()); } + const std::string generic_string(const codecvt_type& cvt) const; const std::wstring generic_wstring() const; const std::wstring generic_wstring(const codecvt_type&) const { return generic_wstring(); }; @@ -426,7 +426,7 @@ namespace filesystem // ----- decomposition ----- - path root_path() const; + path root_path() const; path root_name() const; // returns 0 or 1 element path // even on POSIX, root_name() is non-empty() for network paths path root_directory() const; // returns 0 or 1 element path @@ -455,7 +455,7 @@ namespace filesystem return has_root_directory(); # endif } - bool is_relative() const { return !is_absolute(); } + bool is_relative() const { return !is_absolute(); } // ----- iterators ----- @@ -489,7 +489,7 @@ namespace filesystem # if defined(BOOST_FILESYSTEM_DEPRECATED) // deprecated functions with enough signature or semantic changes that they are - // not supplied by default + // not supplied by default const std::string file_string() const { return string(); } const std::string directory_string() const { return string(); } const std::string native_file_string() const { return string(); } @@ -502,7 +502,7 @@ namespace filesystem //basic_path(const string_type& str, name_check) { operator/=(str); } //basic_path(const typename string_type::value_type* s, name_check) // { operator/=(s);} - //static bool default_name_check_writable() { return false; } + //static bool default_name_check_writable() { return false; } //static void default_name_check(name_check) {} //static name_check default_name_check() { return 0; } //basic_path& canonize(); @@ -529,7 +529,7 @@ namespace filesystem // slashes NOT converted to backslashes # if defined(_MSC_VER) # pragma warning(pop) // restore warning settings. -# endif +# endif string_type::size_type m_append_separator_if_needed(); // Returns: If separator is to be appended, m_pathname.size() before append. Otherwise 0. @@ -541,7 +541,7 @@ namespace filesystem path& m_normalize(); // Was qualified; como433beta8 reports: - // warning #427-D: qualified name is not allowed in member declaration + // warning #427-D: qualified name is not allowed in member declaration friend class iterator; friend bool operator<(const path& lhs, const path& rhs); @@ -565,7 +565,7 @@ namespace filesystem //------------------------------------------------------------------------------------// // class path::iterator // //------------------------------------------------------------------------------------// - + class path::iterator : public boost::iterator_facade< path::iterator, @@ -596,7 +596,7 @@ namespace filesystem // m_path_ptr->m_pathname. // if m_element is implicit dot, m_pos is the // position of the last separator in the path. - // end() iterator is indicated by + // end() iterator is indicated by // m_pos == m_path_ptr->m_pathname.size() }; // path::iterator @@ -611,15 +611,15 @@ namespace filesystem inline bool lexicographical_compare(path::iterator first1, path::iterator last1, path::iterator first2, path::iterator last2) { return detail::lex_compare(first1, last1, first2, last2) < 0; } - + inline bool operator==(const path& lhs, const path& rhs) {return lhs.compare(rhs) == 0;} - inline bool operator==(const path& lhs, const path::string_type& rhs) {return lhs.compare(rhs) == 0;} + inline bool operator==(const path& lhs, const path::string_type& rhs) {return lhs.compare(rhs) == 0;} inline bool operator==(const path::string_type& lhs, const path& rhs) {return rhs.compare(lhs) == 0;} inline bool operator==(const path& lhs, const path::value_type* rhs) {return lhs.compare(rhs) == 0;} inline bool operator==(const path::value_type* lhs, const path& rhs) {return rhs.compare(lhs) == 0;} - + inline bool operator!=(const path& lhs, const path& rhs) {return lhs.compare(rhs) != 0;} - inline bool operator!=(const path& lhs, const path::string_type& rhs) {return lhs.compare(rhs) != 0;} + inline bool operator!=(const path& lhs, const path::string_type& rhs) {return lhs.compare(rhs) != 0;} inline bool operator!=(const path::string_type& lhs, const path& rhs) {return rhs.compare(lhs) != 0;} inline bool operator!=(const path& lhs, const path::value_type* rhs) {return lhs.compare(rhs) != 0;} inline bool operator!=(const path::value_type* lhs, const path& rhs) {return rhs.compare(lhs) != 0;} @@ -658,7 +658,7 @@ namespace filesystem return os << boost::io::quoted(p.template string<std::basic_string<Char> >(), static_cast<Char>('&')); } - + template <class Char, class Traits> inline std::basic_istream<Char, Traits>& operator>>(std::basic_istream<Char, Traits>& is, path& p) @@ -668,7 +668,7 @@ namespace filesystem p = str; return is; } - + // name_checks // These functions are holdovers from version 1. It isn't clear they have much @@ -680,14 +680,14 @@ namespace filesystem BOOST_FILESYSTEM_DECL bool portable_directory_name(const std::string & name); BOOST_FILESYSTEM_DECL bool portable_file_name(const std::string & name); BOOST_FILESYSTEM_DECL bool native(const std::string & name); - + //--------------------------------------------------------------------------------------// // class path member template implementation // //--------------------------------------------------------------------------------------// template <class InputIterator> path& path::append(InputIterator begin, InputIterator end, const codecvt_type& cvt) - { + { if (begin == end) return *this; string_type::size_type sep_pos(m_append_separator_if_needed()); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/format/alt_sstream.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/format/alt_sstream.hpp index d513d243..e236be35 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/format/alt_sstream.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/format/alt_sstream.hpp @@ -1,5 +1,5 @@ // ---------------------------------------------------------------------------- -// alt_sstream.hpp : alternative stringstream +// alt_sstream.hpp : alternative stringstream // ---------------------------------------------------------------------------- // Copyright Samuel Krempp 2003. Use, modification, and distribution are @@ -18,23 +18,23 @@ #include <string> #include <boost/format/detail/compat_workarounds.hpp> #include <boost/utility/base_from_member.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/assert.hpp> namespace boost { namespace io { - template<class Ch, class Tr=::std::char_traits<Ch>, + template<class Ch, class Tr=::std::char_traits<Ch>, class Alloc=::std::allocator<Ch> > class basic_altstringbuf; - template<class Ch, class Tr =::std::char_traits<Ch>, + template<class Ch, class Tr =::std::char_traits<Ch>, class Alloc=::std::allocator<Ch> > class basic_oaltstringstream; template<class Ch, class Tr, class Alloc> - class basic_altstringbuf + class basic_altstringbuf : public ::std::basic_streambuf<Ch, Tr> { typedef ::std::basic_streambuf<Ch, Tr> streambuf_t; @@ -55,14 +55,14 @@ namespace boost { explicit basic_altstringbuf(std::ios_base::openmode mode = std::ios_base::in | std::ios_base::out) - : putend_(NULL), is_allocated_(false), mode_(mode) + : putend_(NULL), is_allocated_(false), mode_(mode) {} explicit basic_altstringbuf(const string_type& s, ::std::ios_base::openmode mode = ::std::ios_base::in | ::std::ios_base::out) - : putend_(NULL), is_allocated_(false), mode_(mode) + : putend_(NULL), is_allocated_(false), mode_(mode) { dealloc(); str(s); } - virtual ~basic_altstringbuf() + virtual ~basic_altstringbuf() { dealloc(); } using streambuf_t::pbase; using streambuf_t::pptr; @@ -70,36 +70,36 @@ namespace boost { using streambuf_t::eback; using streambuf_t::gptr; using streambuf_t::egptr; - + void clear_buffer(); void str(const string_type& s); // 0-copy access : - Ch * begin() const; + Ch * begin() const; size_type size() const; size_type cur_size() const; // stop at current pointer Ch * pend() const // the highest position reached by pptr() since creation { return ((putend_ < pptr()) ? pptr() : putend_); } - size_type pcount() const + size_type pcount() const { return static_cast<size_type>( pptr() - pbase()) ;} // copy buffer to string : - string_type str() const + string_type str() const { return string_type(begin(), size()); } - string_type cur_str() const + string_type cur_str() const { return string_type(begin(), cur_size()); } protected: explicit basic_altstringbuf (basic_altstringbuf * s, - ::std::ios_base::openmode mode + ::std::ios_base::openmode mode = ::std::ios_base::in | ::std::ios_base::out) - : putend_(NULL), is_allocated_(false), mode_(mode) + : putend_(NULL), is_allocated_(false), mode_(mode) { dealloc(); str(s); } - virtual pos_type seekoff(off_type off, ::std::ios_base::seekdir way, - ::std::ios_base::openmode which + virtual pos_type seekoff(off_type off, ::std::ios_base::seekdir way, + ::std::ios_base::openmode which = ::std::ios_base::in | ::std::ios_base::out); - virtual pos_type seekpos (pos_type pos, - ::std::ios_base::openmode which + virtual pos_type seekpos (pos_type pos, + ::std::ios_base::openmode which = ::std::ios_base::in | ::std::ios_base::out); virtual int_type underflow(); virtual int_type pbackfail(int_type meta = compat_traits_type::eof()); @@ -117,53 +117,53 @@ namespace boost { // --- class basic_oaltstringstream ---------------------------------------- template <class Ch, class Tr, class Alloc> - class basic_oaltstringstream - : private base_from_member< std::shared_ptr< basic_altstringbuf< Ch, Tr, Alloc> > >, + class basic_oaltstringstream + : private base_from_member< shared_ptr< basic_altstringbuf< Ch, Tr, Alloc> > >, public ::std::basic_ostream<Ch, Tr> { - class No_Op { + class No_Op { // used as no-op deleter for (not-owner) shared_pointers - public: + public: template<class T> const T & operator()(const T & arg) { return arg; } }; typedef ::std::basic_ostream<Ch, Tr> stream_t; - typedef boost::base_from_member<boost::std::shared_ptr< - basic_altstringbuf<Ch,Tr, Alloc> > > + typedef boost::base_from_member<boost::shared_ptr< + basic_altstringbuf<Ch,Tr, Alloc> > > pbase_type; typedef ::std::basic_string<Ch, Tr, Alloc> string_type; typedef typename string_type::size_type size_type; typedef basic_altstringbuf<Ch, Tr, Alloc> stringbuf_t; public: typedef Alloc allocator_type; - basic_oaltstringstream() - : pbase_type(new stringbuf_t), stream_t(rdbuf()) + basic_oaltstringstream() + : pbase_type(new stringbuf_t), stream_t(rdbuf()) { } - basic_oaltstringstream(::boost::std::shared_ptr<stringbuf_t> buf) - : pbase_type(buf), stream_t(rdbuf()) + basic_oaltstringstream(::boost::shared_ptr<stringbuf_t> buf) + : pbase_type(buf), stream_t(rdbuf()) { } - basic_oaltstringstream(stringbuf_t * buf) - : pbase_type(buf, No_Op() ), stream_t(rdbuf()) + basic_oaltstringstream(stringbuf_t * buf) + : pbase_type(buf, No_Op() ), stream_t(rdbuf()) { } - stringbuf_t * rdbuf() const + stringbuf_t * rdbuf() const { return pbase_type::member.get(); } - void clear_buffer() + void clear_buffer() { rdbuf()->clear_buffer(); } // 0-copy access : - Ch * begin() const + Ch * begin() const { return rdbuf()->begin(); } - size_type size() const + size_type size() const { return rdbuf()->size(); } size_type cur_size() const // stops at current position { return rdbuf()->cur_size(); } // copy buffer to string : string_type str() const // [pbase, epptr[ - { return rdbuf()->str(); } + { return rdbuf()->str(); } string_type cur_str() const // [pbase, pptr[ { return rdbuf()->cur_str(); } - void str(const string_type& s) + void str(const string_type& s) { rdbuf()->str(s); } }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/functional/hash/extensions.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/functional/hash/extensions.hpp index 2144e057..998c08e4 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/functional/hash/extensions.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/functional/hash/extensions.hpp @@ -5,7 +5,7 @@ // Based on Peter Dimov's proposal // http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf -// issue 6.18. +// issue 6.18. // This implements the extensions to the standard. // It's undocumented, so you shouldn't use it.... @@ -358,12 +358,12 @@ namespace boost } }; }; - + template <class T> struct hash_impl_msvc2 : public hash_impl_msvc<boost::is_const<T>::value> ::BOOST_NESTED_TEMPLATE inner<T> {}; - + template <> struct hash_impl<false> { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/get_pointer.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/get_pointer.hpp index 7399d199..b27b98a6 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/get_pointer.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/get_pointer.hpp @@ -9,11 +9,11 @@ // In order to avoid circular dependencies with Boost.TR1 // we make sure that our include of <memory> doesn't try to -// pull in the TR1 headers: that's why we use this header +// pull in the TR1 headers: that's why we use this header // rather than including <memory> directly: #include <boost/config/no_tr1/memory.hpp> // std::auto_ptr -namespace boost { +namespace boost { // get_pointer(p) extracts a ->* capable pointer from p @@ -22,7 +22,7 @@ template<class T> T * get_pointer(T * p) return p; } -// get_pointer(std::shared_ptr<T> const & p) has been moved to std::shared_ptr.hpp +// get_pointer(shared_ptr<T> const & p) has been moved to shared_ptr.hpp template<class T> T * get_pointer(std::auto_ptr<T> const& p) { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/io_error.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/io_error.hpp index e74ca47a..5ea79c58 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/io_error.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/io_error.hpp @@ -1,6 +1,6 @@ /* Copyright 2005-2007 Adobe Systems Incorporated - + Use, modification and distribution are subject to the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt). @@ -20,7 +20,7 @@ #include <ios> #include "../../gil_config.hpp" -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> namespace boost { namespace gil { @@ -30,7 +30,7 @@ inline void io_error_if(bool expr, const char* descr="") { if (expr) io_error(de namespace detail { class file_mgr { protected: - std::shared_ptr<FILE> _fp; + shared_ptr<FILE> _fp; struct null_deleter { void operator()(void const*) const {} }; file_mgr(FILE* file) : _fp(file, null_deleter()) {} @@ -38,7 +38,7 @@ namespace detail { file_mgr(const char* filename, const char* flags) { FILE* fp; io_error_if((fp=fopen(filename,flags))==NULL, "file_mgr: failed to open file"); - _fp=std::shared_ptr<FILE>(fp,fclose); + _fp=shared_ptr<FILE>(fp,fclose); } public: diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_dynamic_io.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_dynamic_io.hpp index 3140e728..b1108fe8 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_dynamic_io.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_dynamic_io.hpp @@ -1,6 +1,6 @@ /* Copyright 2005-2007 Adobe Systems Incorporated - + Use, modification and distribution are subject to the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt). @@ -24,7 +24,7 @@ #include <stdio.h> #include <string> #include <boost/mpl/bool.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include "../dynamic_image/dynamic_image_all.hpp" #include "io_error.hpp" @@ -43,7 +43,7 @@ struct jpeg_write_is_supported { class jpeg_writer_dynamic : public jpeg_writer { int _quality; -public: +public: jpeg_writer_dynamic(FILE* file, int quality=100) : jpeg_writer(file) , _quality(quality) {} jpeg_writer_dynamic(const char* filename, int quality=100) : jpeg_writer(filename), _quality(quality) {} @@ -74,7 +74,7 @@ class jpeg_reader_dynamic : public jpeg_reader { public: jpeg_reader_dynamic(FILE* file) : jpeg_reader(file) {} jpeg_reader_dynamic(const char* filename) : jpeg_reader(filename){} - + template <typename Images> void read_image(any_image<Images>& im) { if (!construct_matched(im,detail::jpeg_type_format_checker(_cinfo.out_color_space))) { @@ -110,7 +110,7 @@ inline void jpeg_read_image(const std::string& filename,any_image<Images>& im) { /// \ingroup JPEG_IO /// \brief Saves the currently instantiated view to a jpeg file specified by the given jpeg image file name. -/// Throws std::ios_base::failure if the currently instantiated view type is not supported for writing by the I/O extension +/// Throws std::ios_base::failure if the currently instantiated view type is not supported for writing by the I/O extension /// or if it fails to create the file. template <typename Views> inline void jpeg_write_view(const char* filename,const any_image_view<Views>& runtime_view) { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_io.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_io.hpp index bdeb56d5..b9adc023 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_io.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_io.hpp @@ -1,6 +1,6 @@ /* Copyright 2005-2007 Adobe Systems Incorporated - + Use, modification and distribution are subject to the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt). @@ -24,7 +24,7 @@ #include <algorithm> #include <string> #include <boost/static_assert.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> extern "C" { #include <jpeglib.h> } @@ -64,7 +64,7 @@ inline point2<std::ptrdiff_t> jpeg_read_dimensions(const std::string& filename) /// \ingroup JPEG_IO /// \brief Loads the image specified by the given jpeg image file name into the given view. /// Triggers a compile assert if the view color space and channel depth are not supported by the JPEG library or by the I/O extension. -/// Throws std::ios_base::failure if the file is not a valid JPEG file, or if its color space or channel depth are not +/// Throws std::ios_base::failure if the file is not a valid JPEG file, or if its color space or channel depth are not /// compatible with the ones specified by View, or if its dimensions don't match the ones of the view. template <typename View> inline void jpeg_read_view(const char* filename,const View& view) { @@ -84,7 +84,7 @@ inline void jpeg_read_view(const std::string& filename,const View& view) { /// \ingroup JPEG_IO /// \brief Allocates a new image whose dimensions are determined by the given jpeg image file, and loads the pixels into it. /// Triggers a compile assert if the image color space or channel depth are not supported by the JPEG library or by the I/O extension. -/// Throws std::ios_base::failure if the file is not a valid JPEG file, or if its color space or channel depth are not +/// Throws std::ios_base::failure if the file is not a valid JPEG file, or if its color space or channel depth are not /// compatible with the ones specified by Image template <typename Image> inline void jpeg_read_image(const char* filename,Image& im) { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_dynamic_io.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_dynamic_io.hpp index 616e2029..a3a25a97 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_dynamic_io.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_dynamic_io.hpp @@ -1,6 +1,6 @@ /* Copyright 2005-2007 Adobe Systems Incorporated - + Use, modification and distribution are subject to the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt). @@ -31,7 +31,7 @@ #include <string> #include <stdio.h> #include <boost/mpl/bool.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include "../dynamic_image/dynamic_image_all.hpp" #include "io_error.hpp" #include "png_io.hpp" @@ -81,7 +81,7 @@ class png_reader_dynamic : public png_reader { public: png_reader_dynamic(FILE* file) : png_reader(file) {} png_reader_dynamic(const char* filename) : png_reader(filename){} - + template <typename Images> void read_image(any_image<Images>& im) { png_uint_32 width, height; @@ -99,7 +99,7 @@ public: } }; -} // namespace detail +} // namespace detail /// \ingroup PNG_IO /// \brief reads a PNG image into a run-time instantiated image @@ -121,7 +121,7 @@ inline void png_read_image(const std::string& filename,any_image<Images>& im) { /// \ingroup PNG_IO /// \brief Saves the currently instantiated view to a png file specified by the given png image file name. -/// Throws std::ios_base::failure if the currently instantiated view type is not supported for writing by the I/O extension +/// Throws std::ios_base::failure if the currently instantiated view type is not supported for writing by the I/O extension /// or if it fails to create the file. template <typename Views> inline void png_write_view(const char* filename,const any_image_view<Views>& runtime_view) { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/detail/self_avoiding_walk.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/detail/self_avoiding_walk.hpp index bd02797f..c171897f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/detail/self_avoiding_walk.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/detail/self_avoiding_walk.hpp @@ -10,19 +10,19 @@ #define BOOST_SELF_AVOIDING_WALK_HPP /* - This file defines necessary components for SAW. + This file defines necessary components for SAW. mesh language: (defined by myself to clearify what is what) A triangle in mesh is called an triangle. - An edge in mesh is called an line. + An edge in mesh is called an line. A vertex in mesh is called a point. A triangular mesh corresponds to a graph in which a vertex is a - triangle and an edge(u, v) stands for triangle u and triangle v + triangle and an edge(u, v) stands for triangle u and triangle v share an line. After this point, a vertex always refers to vertex in graph, - therefore it is a traingle in mesh. + therefore it is a traingle in mesh. */ @@ -43,7 +43,7 @@ namespace boost { triple(const T1& a, const T2& b, const T3& c) : first(a), second(b), third(c) {} triple() : first(SAW_SENTINAL), second(SAW_SENTINAL), third(SAW_SENTINAL) {} }; - + typedef triple<int, int, int> Triple; /* Define a vertex property which has a triangle inside. Triangle is @@ -70,14 +70,14 @@ namespace boost { if ( a.second == b.second || a.second == b.third ) l.second = a.second; else if ( a.third == b.second || a.third == b.third ) - l.second = a.third; + l.second = a.third; } else if ( a.first == b.second ) { l.first = a.first; if ( a.second == b.third ) l.second = a.second; else if ( a.third == b.third ) - l.second = a.third; + l.second = a.third; } else if ( a.first == b.third ) { l.first = a.first; @@ -90,17 +90,17 @@ namespace boost { } else if ( a.second == b.second ) { l.first = a.second; - if ( a.third == b.third ) + if ( a.third == b.third ) l.second = a.third; } else if ( a.second == b.third ) { l.first = a.second; - } else if ( a.third == b.first - || a.third == b.second + } else if ( a.third == b.first + || a.third == b.second || a.third == b.third ) - l.first = a.third; + l.first = a.third; /*Make it in order*/ if ( l.first > l.second ) { @@ -132,7 +132,7 @@ namespace boost { } TriangleDecorator td; }; - + /* HList has to be a handle of data holder so that pass-by-value is * in right logic. * @@ -146,7 +146,7 @@ namespace boost { : public bfs_visitor<>, public dfs_visitor<> { typedef typename boost::property_traits<IteratorD>::value_type iter; - /*use boost std::shared_ptr*/ + /*use boost shared_ptr*/ typedef typename HList::element_type::value_type::second_type Line; public: @@ -176,12 +176,12 @@ namespace boost { using std::make_pair; typedef typename boost::graph_traits<Graph>::vertex_descriptor Vertex; Vertex tau = target(e, G); - Vertex i = source(e, G); + Vertex i = source(e, G); get_vertex_sharing<TriangleDecorator, Vertex, Line> get_sharing_line(td); - + Line tau_i = get_sharing_line(tau, i); - + iter w_end = hlist->end(); iter w_i = iter_d[i]; @@ -197,7 +197,7 @@ namespace boost { *b w(i) |- w(i+1) w(i) ~> w(i+1) or no w(i+1) yet *---------------------------------------------------------- */ - + bool a = false, b = false; --w_i_m_1; @@ -206,13 +206,13 @@ namespace boost { if ( w_i_m_1 != w_end ) { a = ( w_i_m_1->second.first != SAW_SENTINAL ); - } - + } + if ( a ) { - + if ( b ) { - /*Case 1: - + /*Case 1: + w(i-1) |- w(i) |- w(i+1) */ Line l1 = get_sharing_line(*w_i_m_1, tau); @@ -221,7 +221,7 @@ namespace boost { --w_i_m_2; bool c = true; - + if ( w_i_m_2 != w_end ) { c = w_i_m_2->second != l1; } @@ -230,11 +230,11 @@ namespace boost { /*extension: w(i-1) -> tau |- w(i) */ w_i_m_1->second = l1; /*insert(pos, const T&) is to insert before pos*/ - iter_d[tau] = hlist->insert(w_i, make_pair(tau, tau_i)); - + iter_d[tau] = hlist->insert(w_i, make_pair(tau, tau_i)); + } else { /* w(i-1) ^ tau == w(i-2) ^ w(i-1) */ /*must be w(i-2) ~> w(i-1) */ - + bool d = true; //need to handle the case when w_i_p_1 is null Line l3 = get_sharing_line(*w_i_p_1, tau); @@ -261,15 +261,15 @@ namespace boost { ; } } - + } - } else { + } else { /*Case 2: - + w(i-1) |- w(i) ~> w(1+1) */ - - if ( w_i->second.second == tau_i.first + + if ( w_i->second.second == tau_i.first || w_i->second.second == tau_i.second ) { /*w(i) ^ w(i+1) < w(i) ^ tau*/ /*extension: w(i) |- tau -> w(i+1) */ w_i->second = tau_i; @@ -296,23 +296,23 @@ namespace boost { iter_d[w_i_m_1->first] = hlist->insert(w_i_p_1, *w_i_m_1); hlist->erase(w_i_m_1); } - - } - + + } + } - + } else { - + if ( b ) { /*Case 3: - + w(i-1) ~> w(i) |- w(i+1) */ bool c = false; if ( w_i_m_1 != w_end ) c = ( w_i_m_1->second.second == tau_i.first) || ( w_i_m_1->second.second == tau_i.second); - + if ( c ) { /*w(i-1) ^ w(i) < w(i) ^ tau*/ /* extension: w(i-1) -> tau |- w(i) */ if ( w_i_m_1 != w_end ) @@ -336,7 +336,7 @@ namespace boost { /*extension: w(i-1) -> w(i+1) |- w(i) |- tau -> w(i+2) */ iter w_i_p_2 = w_i_p_1; ++w_i_p_2; - + w_i_p_1->second = w_i->second; iter_d[i] = hlist->insert(w_i_p_2, make_pair(i, tau_i)); hlist->erase(w_i); @@ -344,16 +344,16 @@ namespace boost { iter_d[tau] = hlist->insert(w_i_p_2, make_pair(tau, l2)); } } - + } else { /*Case 4: - + w(i-1) ~> w(i) ~> w(i+1) - + */ bool c = false; if ( w_i_m_1 != w_end ) { - c = (w_i_m_1->second.second == tau_i.first) + c = (w_i_m_1->second.second == tau_i.first) || (w_i_m_1->second.second == tau_i.second); } if ( c ) { /*w(i-1) ^ w(i) < w(i) ^ tau */ @@ -361,48 +361,48 @@ namespace boost { if ( w_i_m_1 != w_end ) w_i_m_1->second = get_sharing_line(*w_i_m_1, tau); iter_d[tau] = hlist->insert(w_i, make_pair(tau, tau_i)); - } else { + } else { /*extension: w(i) |- tau -> w(i+1) */ w_i->second = tau_i; Line l1; l1.first = SAW_SENTINAL; l1.second = SAW_SENTINAL; - if ( w_i_p_1 != w_end ) + if ( w_i_p_1 != w_end ) l1 = get_sharing_line(*w_i_p_1, tau); iter_d[tau] = hlist->insert(w_i_p_1, make_pair(tau, l1)); } } - + } return true; } - + protected: TriangleDecorator td; /*a decorator for vertex*/ HList hlist; /*This must be a handle of list to record the SAW The element type of the list is pair<Vertex, Line> */ - - IteratorD iter_d; + + IteratorD iter_d; /*Problem statement: Need a fast access to w for triangle i. - *Possible solution: mantain an array to record. - iter_d[i] will return an iterator + *Possible solution: mantain an array to record. + iter_d[i] will return an iterator which points to w(i), where i is a vertex representing triangle i. */ }; template <class Triangle, class HList, class Iterator> - inline + inline SAW_visitor<Triangle, HList, Iterator> visit_SAW(Triangle t, HList hl, Iterator i) { return SAW_visitor<Triangle, HList, Iterator>(t, hl, i); } template <class Tri, class HList, class Iter> - inline + inline SAW_visitor< random_access_iterator_property_map<Tri*,Tri,Tri&>, HList, random_access_iterator_property_map<Iter*,Iter,Iter&> > visit_SAW_ptr(Tri* t, HList hl, Iter* i) { @@ -412,7 +412,7 @@ namespace boost { } // should also have combo's of pointers, and also const :( - + } #endif /*BOOST_SAW_H*/ diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/detail/mpi_process_group.ipp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/detail/mpi_process_group.ipp index 75a02fe2..a4d35462 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/detail/mpi_process_group.ipp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/detail/mpi_process_group.ipp @@ -40,7 +40,7 @@ namespace boost { namespace graph { namespace distributed { struct mpi_process_group::impl { - + typedef mpi_process_group::message_header message_header; typedef mpi_process_group::outgoing_messages outgoing_messages; @@ -71,7 +71,7 @@ struct mpi_process_group::impl std::size_t batch_header_number; std::size_t batch_buffer_size; std::size_t batch_message_size; - + /** * The actual MPI communicator used to transmit data. */ @@ -90,19 +90,19 @@ struct mpi_process_group::impl /// The numbers of processors that have entered a synchronization stage std::vector<int> processors_synchronizing_stage; - + /// The synchronization stage of a processor std::vector<int> synchronizing_stage; /// Number of processors still sending messages std::vector<int> synchronizing_unfinished; - + /// Number of batches sent since last synchronization stage std::vector<int> number_sent_batches; - + /// Number of batches received minus number of expected batches std::vector<int> number_received_batches; - + /// The context of the currently-executing trigger, or @c trc_none /// if no trigger is executing. @@ -124,7 +124,7 @@ struct mpi_process_group::impl /// The MPI requests for posted sends of oob messages std::vector<MPI_Request> requests; - + /// The MPI buffers for posted irecvs of oob messages std::map<int,buffer_type> buffers; @@ -144,14 +144,14 @@ struct mpi_process_group::impl std::stack<std::size_t> free_batches; void free_sent_batches(); - + // Tag allocator detail::tag_allocator allocated_tags; impl(std::size_t num_headers, std::size_t buffers_size, communicator_type parent_comm); ~impl(); - + private: void set_batch_size(std::size_t header_num, std::size_t buffer_sz); }; @@ -175,7 +175,7 @@ mpi_process_group::send_impl(int dest, int tag, const T& value, header.source = process_id(*this); header.tag = tag; header.offset = outgoing.buffer.size(); - + boost::mpi::packed_oarchive oa(impl_->comm, outgoing.buffer); oa << value; @@ -237,7 +237,7 @@ send(const mpi_process_group& pg, mpi_process_group::process_id_type dest, int tag, const T values[], std::size_t n) { pg.send_impl(dest, pg.encode_tag(pg.my_block_number(), tag), - boost::serialization::make_array(values,n), + boost::serialization::make_array(values,n), boost::mpl::true_()); } @@ -279,7 +279,7 @@ typename disable_if<boost::mpi::is_mpi_datatype<T>, void>::type send(const mpi_process_group& pg, mpi_process_group::process_id_type dest, int tag, const T values[], std::size_t n) { - pg.array_send_impl(dest, pg.encode_tag(pg.my_block_number(), tag), + pg.array_send_impl(dest, pg.encode_tag(pg.my_block_number(), tag), values, n); } @@ -316,7 +316,7 @@ mpi_process_group::receive_impl(int source, int tag, T& value, // Unpack the data if (header->bytes > 0) { - boost::mpi::packed_iarchive ia(impl_->comm, incoming.buffer, + boost::mpi::packed_iarchive ia(impl_->comm, incoming.buffer, archive::no_header, header->offset); ia >> value; } @@ -364,7 +364,7 @@ mpi_process_group::receive_impl(int source, int tag, T& value, if (header == incoming.headers.end()) return false; // Deserialize the data - boost::mpi::packed_iarchive in(impl_->comm, incoming.buffer, + boost::mpi::packed_iarchive in(impl_->comm, incoming.buffer, archive::no_header, header->offset); in >> value; @@ -411,7 +411,7 @@ array_receive_impl(int source, int tag, T* values, std::size_t& n) const if (header == incoming.headers.end()) return false; // Deserialize the data - boost::mpi::packed_iarchive in(impl_->comm, incoming.buffer, + boost::mpi::packed_iarchive in(impl_->comm, incoming.buffer, archive::no_header, header->offset); std::size_t num_sent; in >> num_sent; @@ -455,7 +455,7 @@ template<typename Type, typename Handler> void mpi_process_group::trigger(int tag, const Handler& handler) { BOOST_ASSERT(block_num); - install_trigger(tag,my_block_number(),std::shared_ptr<trigger_base>( + install_trigger(tag,my_block_number(),shared_ptr<trigger_base>( new trigger_launcher<Type, Handler>(*this, tag, handler))); } @@ -463,28 +463,28 @@ template<typename Type, typename Handler> void mpi_process_group::trigger_with_reply(int tag, const Handler& handler) { BOOST_ASSERT(block_num); - install_trigger(tag,my_block_number(),std::shared_ptr<trigger_base>( + install_trigger(tag,my_block_number(),shared_ptr<trigger_base>( new reply_trigger_launcher<Type, Handler>(*this, tag, handler))); } template<typename Type, typename Handler> -void mpi_process_group::global_trigger(int tag, const Handler& handler, +void mpi_process_group::global_trigger(int tag, const Handler& handler, std::size_t sz) { if (sz==0) // normal trigger - install_trigger(tag,0,std::shared_ptr<trigger_base>( + install_trigger(tag,0,shared_ptr<trigger_base>( new global_trigger_launcher<Type, Handler>(*this, tag, handler))); else // trigger with irecv - install_trigger(tag,0,std::shared_ptr<trigger_base>( + install_trigger(tag,0,shared_ptr<trigger_base>( new global_irecv_trigger_launcher<Type, Handler>(*this, tag, handler,sz))); - + } namespace detail { template<typename Type> void do_oob_receive(mpi_process_group const& self, - int source, int tag, Type& data, mpl::true_ /*is_mpi_datatype*/) + int source, int tag, Type& data, mpl::true_ /*is_mpi_datatype*/) { using boost::mpi::get_mpi_datatype; @@ -495,7 +495,7 @@ void do_oob_receive(mpi_process_group const& self, template<typename Type> void do_oob_receive(mpi_process_group const& self, - int source, int tag, Type& data, mpl::false_ /*is_mpi_datatype*/) + int source, int tag, Type& data, mpl::false_ /*is_mpi_datatype*/) { // self.impl_->comm.recv(source,tag,data); // Receive the size of the data packet @@ -521,7 +521,7 @@ void do_oob_receive(mpi_process_group const& self, } template<typename Type> -void do_oob_receive(mpi_process_group const& self, int source, int tag, Type& data) +void do_oob_receive(mpi_process_group const& self, int source, int tag, Type& data) { do_oob_receive(self, source, tag, data, boost::mpi::is_mpi_datatype<Type>()); @@ -532,13 +532,13 @@ void do_oob_receive(mpi_process_group const& self, int source, int tag, Type& da template<typename Type, typename Handler> -void +void mpi_process_group::trigger_launcher<Type, Handler>:: -receive(mpi_process_group const&, int source, int tag, +receive(mpi_process_group const&, int source, int tag, trigger_receive_context context, int block) const { #ifdef PBGL_PROCESS_GROUP_DEBUG - std::cerr << (out_of_band? "OOB trigger" : "Trigger") + std::cerr << (out_of_band? "OOB trigger" : "Trigger") << " receive from source " << source << " and tag " << tag << " in block " << (block == -1 ? self.my_block_number() : block) << std::endl; #endif @@ -560,13 +560,13 @@ receive(mpi_process_group const&, int source, int tag, } template<typename Type, typename Handler> -void +void mpi_process_group::reply_trigger_launcher<Type, Handler>:: -receive(mpi_process_group const&, int source, int tag, +receive(mpi_process_group const&, int source, int tag, trigger_receive_context context, int block) const { #ifdef PBGL_PROCESS_GROUP_DEBUG - std::cerr << (out_of_band? "OOB reply trigger" : "Reply trigger") + std::cerr << (out_of_band? "OOB reply trigger" : "Reply trigger") << " receive from source " << source << " and tag " << tag << " in block " << (block == -1 ? self.my_block_number() : block) << std::endl; #endif @@ -581,18 +581,18 @@ receive(mpi_process_group const&, int source, int tag, // Pass the message off to the handler and send the result back to // the source. - send_oob(self, source, data.first, + send_oob(self, source, data.first, handler(source, tag, data.second, context), -2); } template<typename Type, typename Handler> -void +void mpi_process_group::global_trigger_launcher<Type, Handler>:: -receive(mpi_process_group const& self, int source, int tag, +receive(mpi_process_group const& self, int source, int tag, trigger_receive_context context, int block) const { #ifdef PBGL_PROCESS_GROUP_DEBUG - std::cerr << (out_of_band? "OOB trigger" : "Trigger") + std::cerr << (out_of_band? "OOB trigger" : "Trigger") << " receive from source " << source << " and tag " << tag << " in block " << (block == -1 ? self.my_block_number() : block) << std::endl; #endif @@ -615,13 +615,13 @@ receive(mpi_process_group const& self, int source, int tag, template<typename Type, typename Handler> -void +void mpi_process_group::global_irecv_trigger_launcher<Type, Handler>:: -receive(mpi_process_group const& self, int source, int tag, +receive(mpi_process_group const& self, int source, int tag, trigger_receive_context context, int block) const { #ifdef PBGL_PROCESS_GROUP_DEBUG - std::cerr << (out_of_band? "OOB trigger" : "Trigger") + std::cerr << (out_of_band? "OOB trigger" : "Trigger") << " receive from source " << source << " and tag " << tag << " in block " << (block == -1 ? self.my_block_number() : block) << std::endl; #endif @@ -644,12 +644,12 @@ receive(mpi_process_group const& self, int source, int tag, template<typename Type, typename Handler> -void +void mpi_process_group::global_irecv_trigger_launcher<Type, Handler>:: prepare_receive(mpi_process_group const& self, int tag, bool force) const { #ifdef PBGL_PROCESS_GROUP_DEBUG - std::cerr << ("Posting Irecv for trigger") + std::cerr << ("Posting Irecv for trigger") << " receive with tag " << tag << std::endl; #endif if (self.impl_->buffers.find(tag) == self.impl_->buffers.end()) { @@ -657,7 +657,7 @@ prepare_receive(mpi_process_group const& self, int tag, bool force) const force = true; } BOOST_ASSERT(static_cast<int>(self.impl_->buffers[tag].size()) >= buffer_size); - + //BOOST_MPL_ASSERT(mpl::not_<is_mpi_datatype<Type> >); if (force) { self.impl_->requests.push_back(MPI_Request()); @@ -681,8 +681,8 @@ receive(const mpi_process_group& pg, int tag, T& value) } template<typename T> -typename - enable_if<boost::mpi::is_mpi_datatype<T>, +typename + enable_if<boost::mpi::is_mpi_datatype<T>, std::pair<mpi_process_group::process_id_type, std::size_t> >::type receive(const mpi_process_group& pg, int tag, T values[], std::size_t n) { @@ -691,15 +691,15 @@ receive(const mpi_process_group& pg, int tag, T values[], std::size_t n) pg.receive_impl(source, pg.encode_tag(pg.my_block_number(), tag), boost::serialization::make_array(values,n), boost::mpl::true_()); - if (result) + if (result) return std::make_pair(source, n); } BOOST_ASSERT(false); } template<typename T> -typename - disable_if<boost::mpi::is_mpi_datatype<T>, +typename + disable_if<boost::mpi::is_mpi_datatype<T>, std::pair<mpi_process_group::process_id_type, std::size_t> >::type receive(const mpi_process_group& pg, int tag, T values[], std::size_t n) { @@ -730,14 +730,14 @@ receive(const mpi_process_group& pg, } template<typename T> -typename - enable_if<boost::mpi::is_mpi_datatype<T>, +typename + enable_if<boost::mpi::is_mpi_datatype<T>, std::pair<mpi_process_group::process_id_type, std::size_t> >::type -receive(const mpi_process_group& pg, int source, int tag, T values[], +receive(const mpi_process_group& pg, int source, int tag, T values[], std::size_t n) { if (pg.receive_impl(source, pg.encode_tag(pg.my_block_number(), tag), - boost::serialization::make_array(values,n), + boost::serialization::make_array(values,n), boost::mpl::true_())) return std::make_pair(source,n); else { @@ -751,10 +751,10 @@ receive(const mpi_process_group& pg, int source, int tag, T values[], } template<typename T> -typename - disable_if<boost::mpi::is_mpi_datatype<T>, +typename + disable_if<boost::mpi::is_mpi_datatype<T>, std::pair<mpi_process_group::process_id_type, std::size_t> >::type -receive(const mpi_process_group& pg, int source, int tag, T values[], +receive(const mpi_process_group& pg, int source, int tag, T values[], std::size_t n) { pg.array_receive_impl(source, pg.encode_tag(pg.my_block_number(), tag), @@ -775,7 +775,7 @@ all_reduce(const mpi_process_group& pg, T* first, T* last, T* out, if (inplace) out = new T [last-first]; boost::mpi::all_reduce(boost::mpi::communicator(communicator(pg), - boost::mpi::comm_attach), + boost::mpi::comm_attach), first, last-first, out, bin_op); if (inplace) { @@ -789,10 +789,10 @@ all_reduce(const mpi_process_group& pg, T* first, T* last, T* out, template<typename T> void -broadcast(const mpi_process_group& pg, T& val, +broadcast(const mpi_process_group& pg, T& val, mpi_process_group::process_id_type root) { - // broadcast the seed + // broadcast the seed boost::mpi::communicator comm(communicator(pg),boost::mpi::comm_attach); boost::mpi::broadcast(comm,val,root); } @@ -914,7 +914,7 @@ Receiver* mpi_process_group::get_receiver() template<typename T> typename enable_if<boost::mpi::is_mpi_datatype<T> >::type -receive_oob(const mpi_process_group& pg, +receive_oob(const mpi_process_group& pg, mpi_process_group::process_id_type source, int tag, T& value, int block) { using boost::mpi::get_mpi_datatype; @@ -926,8 +926,8 @@ receive_oob(const mpi_process_group& pg, // Post a non-blocking receive that waits until we complete this request. MPI_Request request; - MPI_Irecv(&value, 1, get_mpi_datatype<T>(value), - source, actual.second, actual.first, &request); + MPI_Irecv(&value, 1, get_mpi_datatype<T>(value), + source, actual.second, actual.first, &request); int done = 0; do { @@ -939,7 +939,7 @@ receive_oob(const mpi_process_group& pg, template<typename T> typename disable_if<boost::mpi::is_mpi_datatype<T> >::type -receive_oob(const mpi_process_group& pg, +receive_oob(const mpi_process_group& pg, mpi_process_group::process_id_type source, int tag, T& value, int block) { // Determine the actual message we expect to receive, and which @@ -967,11 +967,11 @@ receive_oob(const mpi_process_group& pg, MPI_Get_count(&mpi_status, MPI_PACKED, &size); in.resize(size); #endif - + // Receive the message data MPI_Recv(in.address(), in.size(), MPI_PACKED, status->source(), status->tag(), actual.first, MPI_STATUS_IGNORE); - + // Unpack the message data in >> value; } @@ -979,7 +979,7 @@ receive_oob(const mpi_process_group& pg, template<typename SendT, typename ReplyT> typename enable_if<boost::mpi::is_mpi_datatype<ReplyT> >::type -send_oob_with_reply(const mpi_process_group& pg, +send_oob_with_reply(const mpi_process_group& pg, mpi_process_group::process_id_type dest, int tag, const SendT& send_value, ReplyT& reply_value, int block) @@ -992,14 +992,14 @@ send_oob_with_reply(const mpi_process_group& pg, template<typename SendT, typename ReplyT> typename disable_if<boost::mpi::is_mpi_datatype<ReplyT> >::type -send_oob_with_reply(const mpi_process_group& pg, +send_oob_with_reply(const mpi_process_group& pg, mpi_process_group::process_id_type dest, int tag, const SendT& send_value, ReplyT& reply_value, int block) { detail::tag_allocator::token reply_tag = pg.impl_->allocated_tags.get_tag(); - send_oob(pg, dest, tag, - boost::parallel::detail::make_untracked_pair((int)reply_tag, + send_oob(pg, dest, tag, + boost::parallel::detail::make_untracked_pair((int)reply_tag, send_value), block); receive_oob(pg, dest, reply_tag, reply_value); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/mpi_process_group.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/mpi_process_group.hpp index 57bbfbbc..e0ee5790 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/mpi_process_group.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/mpi_process_group.hpp @@ -20,7 +20,7 @@ #define SEND_OOB_BSEND #include <boost/optional.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <utility> #include <memory> @@ -48,7 +48,7 @@ class mpi_process_group * The type of a "receive" handler, that will be provided with * (source, tag) pairs when a message is received. Users can provide a * receive handler for a distributed data structure, for example, to - * automatically pick up and respond to messages as needed. + * automatically pick up and respond to messages as needed. */ typedef function<void(int source, int tag)> receiver_type; @@ -75,7 +75,7 @@ class mpi_process_group /// Classification of the capabilities of this process group struct communication_category - : virtual parallel::bsp_process_group_tag, + : virtual parallel::bsp_process_group_tag, virtual mpi_process_group_tag { }; // TBD: We can eliminate the "source" field and possibly the @@ -92,7 +92,7 @@ class mpi_process_group /// The length of the message in the buffer, in bytes std::size_t bytes; - + template <class Archive> void serialize(Archive& ar, int) { @@ -113,14 +113,14 @@ class mpi_process_group std::vector<message_header> headers; buffer_type buffer; - + template <class Archive> void serialize(Archive& ar, int) { ar & headers & buffer; } - - void swap(outgoing_messages& x) + + void swap(outgoing_messages& x) { headers.swap(x.headers); buffer.swap(x.buffer); @@ -137,21 +137,21 @@ private: public: explicit trigger_base(int tag) : tag_(tag) { } - /// Retrieve the tag associated with this trigger + /// Retrieve the tag associated with this trigger int tag() const { return tag_; } virtual ~trigger_base() { } /** - * Invoked to receive a message that matches a particular trigger. + * Invoked to receive a message that matches a particular trigger. * * @param source the source of the message * @param tag the (local) tag of the message * @param context the context under which the trigger is being * invoked */ - virtual void - receive(mpi_process_group const& pg, int source, int tag, + virtual void + receive(mpi_process_group const& pg, int source, int tag, trigger_receive_context context, int block=-1) const = 0; protected: @@ -162,19 +162,19 @@ private: /** * Launches a specific handler in response to a trigger. This * function object wraps up the handler function object and a buffer - * for incoming data. + * for incoming data. */ template<typename Type, typename Handler> class trigger_launcher : public trigger_base { public: - explicit trigger_launcher(mpi_process_group& self, int tag, - const Handler& handler) - : trigger_base(tag), self(self), handler(handler) + explicit trigger_launcher(mpi_process_group& self, int tag, + const Handler& handler) + : trigger_base(tag), self(self), handler(handler) {} - void - receive(mpi_process_group const& pg, int source, int tag, + void + receive(mpi_process_group const& pg, int source, int tag, trigger_receive_context context, int block=-1) const; private: @@ -191,13 +191,13 @@ private: class reply_trigger_launcher : public trigger_base { public: - explicit reply_trigger_launcher(mpi_process_group& self, int tag, - const Handler& handler) - : trigger_base(tag), self(self), handler(handler) + explicit reply_trigger_launcher(mpi_process_group& self, int tag, + const Handler& handler) + : trigger_base(tag), self(self), handler(handler) {} - void - receive(mpi_process_group const& pg, int source, int tag, + void + receive(mpi_process_group const& pg, int source, int tag, trigger_receive_context context, int block=-1) const; private: @@ -209,14 +209,14 @@ private: class global_trigger_launcher : public trigger_base { public: - explicit global_trigger_launcher(mpi_process_group& self, int tag, - const Handler& handler) - : trigger_base(tag), handler(handler) - { + explicit global_trigger_launcher(mpi_process_group& self, int tag, + const Handler& handler) + : trigger_base(tag), handler(handler) + { } - void - receive(mpi_process_group const& pg, int source, int tag, + void + receive(mpi_process_group const& pg, int source, int tag, trigger_receive_context context, int block=-1) const; private: @@ -229,15 +229,15 @@ private: class global_irecv_trigger_launcher : public trigger_base { public: - explicit global_irecv_trigger_launcher(mpi_process_group& self, int tag, - const Handler& handler, int sz) + explicit global_irecv_trigger_launcher(mpi_process_group& self, int tag, + const Handler& handler, int sz) : trigger_base(tag), handler(handler), buffer_size(sz) - { + { prepare_receive(self,tag); } - void - receive(mpi_process_group const& pg, int source, int tag, + void + receive(mpi_process_group const& pg, int source, int tag, trigger_receive_context context, int block=-1) const; private: @@ -249,32 +249,32 @@ private: }; public: - /** + /** * Construct a new BSP process group from an MPI communicator. The * MPI communicator will be duplicated to create a new communicator * for this process group to use. */ mpi_process_group(communicator_type parent_comm = communicator_type()); - /** + /** * Construct a new BSP process group from an MPI communicator. The * MPI communicator will be duplicated to create a new communicator * for this process group to use. This constructor allows to tune the * size of message batches. - * + * * @param num_headers The maximum number of headers in a message batch * * @param buffer_size The maximum size of the message buffer in a batch. * */ - mpi_process_group( std::size_t num_headers, std::size_t buffer_size, + mpi_process_group( std::size_t num_headers, std::size_t buffer_size, communicator_type parent_comm = communicator_type()); /** * Construct a copy of the BSP process group for a new distributed * data structure. This data structure will synchronize with all * other members of the process group's equivalence class (including - * @p other), but will have its own set of tags. + * @p other), but will have its own set of tags. * * @param other The process group that this new process group will * be based on, using a different set of tags within the same @@ -296,9 +296,9 @@ public: * Construct a copy of the BSP process group for a new distributed * data structure. This data structure will synchronize with all * other members of the process group's equivalence class (including - * @p other), but will have its own set of tags. + * @p other), but will have its own set of tags. */ - mpi_process_group(const mpi_process_group& other, + mpi_process_group(const mpi_process_group& other, attach_distributed_object, bool out_of_band_receive = false); @@ -335,7 +335,7 @@ public: void replace_on_synchronize_handler(const on_synchronize_event_type& handler = 0); - /** + /** * Return the block number of the current data structure. A value of * 0 indicates that this particular instance of the process group is * not associated with any distributed data structure. @@ -350,7 +350,7 @@ public: { return block_num * max_tags + tag; } /** - * Decode an encoded tag into a block number/tag pair. + * Decode an encoded tag into a block number/tag pair. */ std::pair<int, int> decode_tag(int encoded_tag) const { return std::make_pair(encoded_tag / max_tags, encoded_tag % max_tags); } @@ -366,13 +366,13 @@ public: */ int allocate_block(bool out_of_band_receive = false); - /** Potentially emit a receive event out of band. Returns true if an event - * was actually sent, false otherwise. + /** Potentially emit a receive event out of band. Returns true if an event + * was actually sent, false otherwise. */ bool maybe_emit_receive(int process, int encoded_tag) const; /** Emit a receive event. Returns true if an event was actually - * sent, false otherwise. + * sent, false otherwise. */ bool emit_receive(int process, int encoded_tag) const; @@ -450,7 +450,7 @@ public: void trigger_with_reply(int tag, const Handler& handler); template<typename Type, typename Handler> - void global_trigger(int tag, const Handler& handler, std::size_t buffer_size=0); + void global_trigger(int tag, const Handler& handler, std::size_t buffer_size=0); @@ -468,7 +468,7 @@ public: * @param synchronizing whether we are currently synchronizing the * process group */ - optional<std::pair<int, int> > + optional<std::pair<int, int> > poll(bool wait = false, int block = -1, bool synchronizing = false) const; /** @@ -489,11 +489,11 @@ public: /// /// Determine the actual communicator and tag will be used for a /// transmission with the given tag. - std::pair<boost::mpi::communicator, int> + std::pair<boost::mpi::communicator, int> actual_communicator_and_tag(int tag, int block) const; /// set the size of the message buffer used for buffered oob sends - + static void set_message_buffer_size(std::size_t s); /// get the size of the message buffer used for buffered oob sends @@ -503,12 +503,12 @@ public: static void* old_buffer; private: - void install_trigger(int tag, int block, - std::shared_ptr<trigger_base> const& launcher); + void install_trigger(int tag, int block, + shared_ptr<trigger_base> const& launcher); void poll_requests(int block=-1) const; - + // send a batch if the buffer is full now or would get full void maybe_send_batch(process_id_type dest) const; @@ -527,7 +527,7 @@ private: void receive_batch(boost::mpi::status& status) const; //void free_finished_sends() const; - + /// Status messages used internally by the process group enum status_messages { /// the first of the reserved message tags @@ -557,13 +557,13 @@ private: /// Handler for receive events receiver_type on_receive; - /// Handler executed at the start of synchronization + /// Handler executed at the start of synchronization on_synchronize_event_type on_synchronize; /// Individual message triggers. Note: at present, this vector is /// indexed by the (local) tag of the trigger. Any tags that /// don't have triggers will have NULL pointers in that spot. - std::vector<std::shared_ptr<trigger_base> > triggers; + std::vector<shared_ptr<trigger_base> > triggers; }; /** @@ -581,7 +581,7 @@ private: * @c block_num. */ struct deallocate_block; - + static std::vector<char> message_buffer; public: @@ -589,17 +589,17 @@ public: * Data associated with the process group and all of its attached * distributed data structures. */ - std::shared_ptr<impl> impl_; + shared_ptr<impl> impl_; /** * When non-null, indicates that this copy of the process group is * associated with a particular distributed data structure. The * integer value contains the block number (a value > 0) associated - * with that data structure. The deleter for this @c std::shared_ptr is a + * with that data structure. The deleter for this @c shared_ptr is a * @c deallocate_block object that will deallocate the associated * block in @c impl_->blocks. */ - std::shared_ptr<int> block_num; + shared_ptr<int> block_num; /** * Rank of this process, to avoid having to call rank() repeatedly. @@ -615,11 +615,11 @@ public: -inline mpi_process_group::process_id_type +inline mpi_process_group::process_id_type process_id(const mpi_process_group& pg) { return pg.rank; } -inline mpi_process_group::process_size_type +inline mpi_process_group::process_size_type num_processes(const mpi_process_group& pg) { return pg.size; } @@ -683,7 +683,7 @@ process_subgroup(const mpi_process_group& pg, template<typename T> void -broadcast(const mpi_process_group& pg, T& val, +broadcast(const mpi_process_group& pg, T& val, mpi_process_group::process_id_type root); @@ -705,15 +705,15 @@ send_oob(const mpi_process_group& pg, mpi_process_group::process_id_type dest, #ifdef SEND_OOB_BSEND if (mpi_process_group::message_buffer_size()) { - MPI_Bsend(const_cast<T*>(&value), 1, get_mpi_datatype<T>(value), dest, + MPI_Bsend(const_cast<T*>(&value), 1, get_mpi_datatype<T>(value), dest, actual.second, actual.first); return; } #endif MPI_Request request; - MPI_Isend(const_cast<T*>(&value), 1, get_mpi_datatype<T>(value), dest, + MPI_Isend(const_cast<T*>(&value), 1, get_mpi_datatype<T>(value), dest, actual.second, actual.first, &request); - + int done=0; do { pg.poll(); @@ -759,24 +759,24 @@ send_oob(const mpi_process_group& pg, mpi_process_group::process_id_type dest, template<typename T> typename enable_if<boost::mpi::is_mpi_datatype<T> >::type -receive_oob(const mpi_process_group& pg, +receive_oob(const mpi_process_group& pg, mpi_process_group::process_id_type source, int tag, T& value, int block=-1); template<typename T> typename disable_if<boost::mpi::is_mpi_datatype<T> >::type -receive_oob(const mpi_process_group& pg, +receive_oob(const mpi_process_group& pg, mpi_process_group::process_id_type source, int tag, T& value, int block=-1); template<typename SendT, typename ReplyT> typename enable_if<boost::mpi::is_mpi_datatype<ReplyT> >::type -send_oob_with_reply(const mpi_process_group& pg, +send_oob_with_reply(const mpi_process_group& pg, mpi_process_group::process_id_type dest, int tag, const SendT& send_value, ReplyT& reply_value, int block = -1); template<typename SendT, typename ReplyT> typename disable_if<boost::mpi::is_mpi_datatype<ReplyT> >::type -send_oob_with_reply(const mpi_process_group& pg, +send_oob_with_reply(const mpi_process_group& pg, mpi_process_group::process_id_type dest, int tag, const SendT& send_value, ReplyT& reply_value, int block = -1); @@ -791,7 +791,7 @@ namespace boost { namespace mpi { namespace std { /// optimized swap for outgoing messages -inline void +inline void swap(boost::graph::distributed::mpi_process_group::outgoing_messages& x, boost::graph::distributed::mpi_process_group::outgoing_messages& y) { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/queue.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/queue.hpp index e79c46ed..7e84272a 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/queue.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/queue.hpp @@ -15,7 +15,7 @@ #include <boost/graph/parallel/process_group.hpp> #include <boost/optional.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <vector> namespace boost { namespace graph { namespace distributed { @@ -213,12 +213,12 @@ class distributed_queue void setup_triggers(); // Message handlers - void - handle_push(int source, int tag, const value_type& value, + void + handle_push(int source, int tag, const value_type& value, trigger_receive_context); - void - handle_multipush(int source, int tag, const std::vector<value_type>& values, + void + handle_multipush(int source, int tag, const std::vector<value_type>& values, trigger_receive_context); mutable ProcessGroup process_group; @@ -229,7 +229,7 @@ class distributed_queue typedef std::vector<value_type> outgoing_buffer_t; typedef std::vector<outgoing_buffer_t> outgoing_buffers_t; - std::shared_ptr<outgoing_buffers_t> outgoing_buffers; + shared_ptr<outgoing_buffers_t> outgoing_buffers; }; /// Helper macro containing the normal names for the template diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/rmat_graph_generator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/rmat_graph_generator.hpp index 261794d8..dec8250d 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/rmat_graph_generator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/rmat_graph_generator.hpp @@ -25,7 +25,7 @@ namespace boost { // requires an MPI process group. Run-time is slightly worse than // the unique rmat generator. Edge list generated is sorted and // unique. - template<typename ProcessGroup, typename Distribution, + template<typename ProcessGroup, typename Distribution, typename RandomGenerator, typename Graph> class scalable_rmat_iterator { @@ -47,8 +47,8 @@ namespace boost { // Initialize for edge generation scalable_rmat_iterator(ProcessGroup pg, Distribution distrib, - RandomGenerator& gen, vertices_size_type n, - edges_size_type m, double a, double b, double c, + RandomGenerator& gen, vertices_size_type n, + edges_size_type m, double a, double b, double c, double d, bool permute_vertices = true) : gen(), done(false) { @@ -58,12 +58,12 @@ namespace boost { this->gen.reset(new uniform_01<RandomGenerator>(gen)); std::vector<vertices_size_type> vertexPermutation; - if (permute_vertices) + if (permute_vertices) generate_permutation_vector(gen, vertexPermutation, n); int SCALE = int(floor(log(double(n))/log(2.))); boost::uniform_01<RandomGenerator> prob(gen); - + std::map<value_type, bool> edge_map; edges_size_type generated = 0, local_edges = 0; @@ -121,13 +121,13 @@ namespace boost { reference operator*() const { return current; } pointer operator->() const { return ¤t; } - + scalable_rmat_iterator& operator++() { if (!values.empty()) { current = values.back(); values.pop_back(); - } else + } else done = true; return *this; @@ -151,7 +151,7 @@ namespace boost { private: // Parameters - std::shared_ptr<uniform_01<RandomGenerator> > gen; + shared_ptr<uniform_01<RandomGenerator> > gen; // Internal data structures std::vector<value_type> values; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/vertex_list_adaptor.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/vertex_list_adaptor.hpp index 1d7f9502..8928479a 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/vertex_list_adaptor.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/distributed/vertex_list_adaptor.hpp @@ -16,7 +16,7 @@ #include <boost/graph/graph_traits.hpp> #include <vector> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/property_map/property_map.hpp> #include <boost/graph/parallel/algorithm.hpp> #include <boost/graph/parallel/container_traits.hpp> @@ -25,9 +25,9 @@ namespace boost { namespace graph { // -------------------------------------------------------------------------- -// Global index map built from a distribution +// Global index map built from a distribution // -------------------------------------------------------------------------- -template<typename Distribution, typename OwnerPropertyMap, +template<typename Distribution, typename OwnerPropertyMap, typename LocalPropertyMap> class distribution_global_index_map { @@ -47,16 +47,16 @@ class distribution_global_index_map LocalPropertyMap local; }; -template<typename Distribution, typename OwnerPropertyMap, +template<typename Distribution, typename OwnerPropertyMap, typename LocalPropertyMap> -inline +inline typename distribution_global_index_map<Distribution, OwnerPropertyMap, LocalPropertyMap>::value_type get(const distribution_global_index_map<Distribution, OwnerPropertyMap, LocalPropertyMap>& p, typename distribution_global_index_map<Distribution, OwnerPropertyMap, LocalPropertyMap>::key_type x) -{ +{ using boost::get; return p.distribution_.global(get(p.owner, x), get(p.local, x)); } @@ -64,15 +64,15 @@ get(const distribution_global_index_map<Distribution, OwnerPropertyMap, template<typename Graph, typename Distribution> inline distribution_global_index_map< - Distribution, + Distribution, typename property_map<Graph, vertex_owner_t>::const_type, typename property_map<Graph, vertex_local_t>::const_type> make_distribution_global_index_map(const Graph& g, const Distribution& d) { typedef distribution_global_index_map< - Distribution, + Distribution, typename property_map<Graph, vertex_owner_t>::const_type, - typename property_map<Graph, vertex_local_t>::const_type> + typename property_map<Graph, vertex_local_t>::const_type> result_type; return result_type(d, get(vertex_owner, g), get(vertex_local, g)); } @@ -86,7 +86,7 @@ class stored_global_index_map : public IndexMap public: typedef readable_property_map_tag category; - stored_global_index_map(const IndexMap& index_map) : IndexMap(index_map) { + stored_global_index_map(const IndexMap& index_map) : IndexMap(index_map) { // When we have a global index, we need to always have the indices // of every key we've seen this->set_max_ghost_cells(0); @@ -98,13 +98,13 @@ class stored_global_index_map : public IndexMap // -------------------------------------------------------------------------- namespace detail { template<typename PropertyMap, typename ForwardIterator> - inline void - initialize_global_index_map(const PropertyMap&, - ForwardIterator, ForwardIterator) + inline void + initialize_global_index_map(const PropertyMap&, + ForwardIterator, ForwardIterator) { } template<typename IndexMap, typename ForwardIterator> - void + void initialize_global_index_map(stored_global_index_map<IndexMap>& p, ForwardIterator first, ForwardIterator last) { @@ -126,18 +126,18 @@ class vertex_list_adaptor : public graph_traits<Graph> typedef graph_traits<Graph> inherited; typedef typename inherited::traversal_category base_traversal_category; - + public: typedef typename inherited::vertex_descriptor vertex_descriptor; typedef typename std::vector<vertex_descriptor>::iterator vertex_iterator; typedef typename std::vector<vertex_descriptor>::size_type vertices_size_type; - struct traversal_category + struct traversal_category : public virtual base_traversal_category, public virtual vertex_list_graph_tag {}; - vertex_list_adaptor(const Graph& g, + vertex_list_adaptor(const Graph& g, const GlobalIndexMap& index_map = GlobalIndexMap()) : g(&g), index_map(index_map) { @@ -146,7 +146,7 @@ class vertex_list_adaptor : public graph_traits<Graph> all_vertices_.reset(new std::vector<vertex_descriptor>()); all_gather(process_group(), vertices(g).first, vertices(g).second, *all_vertices_); - detail::initialize_global_index_map(this->index_map, + detail::initialize_global_index_map(this->index_map, all_vertices_->begin(), all_vertices_->end()); } @@ -156,13 +156,13 @@ class vertex_list_adaptor : public graph_traits<Graph> // -------------------------------------------------------------------------- // Distributed Container // -------------------------------------------------------------------------- - typedef typename boost::graph::parallel::process_group_type<Graph>::type + typedef typename boost::graph::parallel::process_group_type<Graph>::type process_group_type; - process_group_type process_group() const - { + process_group_type process_group() const + { using boost::graph::parallel::process_group; - return process_group(*g); + return process_group(*g); } std::pair<vertex_iterator, vertex_iterator> vertices() const @@ -175,7 +175,7 @@ class vertex_list_adaptor : public graph_traits<Graph> private: const Graph* g; GlobalIndexMap index_map; - std::shared_ptr<std::vector<vertex_descriptor> > all_vertices_; + shared_ptr<std::vector<vertex_descriptor> > all_vertices_; }; template<typename Graph, typename GlobalIndexMap> @@ -197,18 +197,18 @@ namespace detail { } template<typename Graph> -inline -vertex_list_adaptor<Graph, +inline +vertex_list_adaptor<Graph, typename detail::default_global_index_map<Graph>::type> make_vertex_list_adaptor(const Graph& g) -{ - typedef typename detail::default_global_index_map<Graph>::type +{ + typedef typename detail::default_global_index_map<Graph>::type GlobalIndexMap; typedef typename detail::default_global_index_map<Graph>::distributed_map DistributedMap; typedef vertex_list_adaptor<Graph, GlobalIndexMap> result_type; - return result_type(g, - GlobalIndexMap(DistributedMap(num_vertices(g), + return result_type(g, + GlobalIndexMap(DistributedMap(num_vertices(g), get(vertex_index, g)))); } @@ -375,7 +375,7 @@ namespace boost { // Property Graph: vertex_index property // -------------------------------------------------------------------------- template<typename Graph, typename GlobalIndexMap> -class property_map<vertex_index_t, +class property_map<vertex_index_t, graph::vertex_list_adaptor<Graph, GlobalIndexMap> > { public: @@ -384,7 +384,7 @@ public: }; template<typename Graph, typename GlobalIndexMap> -class property_map<vertex_index_t, +class property_map<vertex_index_t, const graph::vertex_list_adaptor<Graph, GlobalIndexMap> > { public: diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/erdos_renyi_generator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/erdos_renyi_generator.hpp index d90ba36a..5be06d79 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/erdos_renyi_generator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/erdos_renyi_generator.hpp @@ -13,7 +13,7 @@ #include <boost/assert.hpp> #include <iterator> #include <utility> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/random/uniform_int.hpp> #include <boost/graph/graph_traits.hpp> #include <boost/random/geometric_distribution.hpp> @@ -31,7 +31,7 @@ namespace boost { std::pair<typename graph_traits<Graph>::vertices_size_type, typename graph_traits<Graph>::vertices_size_type>, std::input_iterator_tag, - const + const std::pair<typename graph_traits<Graph>::vertices_size_type, typename graph_traits<Graph>::vertices_size_type>&> { @@ -97,7 +97,7 @@ namespace boost { std::pair<typename graph_traits<Graph>::vertices_size_type, typename graph_traits<Graph>::vertices_size_type>, std::input_iterator_tag, - const + const std::pair<typename graph_traits<Graph>::vertices_size_type, typename graph_traits<Graph>::vertices_size_type>&> { @@ -181,7 +181,7 @@ namespace boost { if (src == n) src = (std::numeric_limits<vertices_size_type>::max)(); } - std::shared_ptr<uniform_01<RandomGenerator*> > gen; + shared_ptr<uniform_01<RandomGenerator*> > gen; geometric_distribution<vertices_size_type> rand_vertex; vertices_size_type n; bool allow_self_loops; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/gursoy_atun_layout.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/gursoy_atun_layout.hpp index 62587f9e..9269c4b0 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/gursoy_atun_layout.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/gursoy_atun_layout.hpp @@ -26,13 +26,13 @@ #include <boost/graph/properties.hpp> #include <boost/random/uniform_01.hpp> #include <boost/random/linear_congruential.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/graph/breadth_first_search.hpp> #include <boost/graph/dijkstra_shortest_paths.hpp> #include <boost/graph/named_function_params.hpp> #include <boost/graph/topology.hpp> -namespace boost { +namespace boost { namespace detail { @@ -62,12 +62,12 @@ struct update_position_visitor { double distance_limit, double learning_constant, double falloff_ratio): - position_map(position_map), node_distance(node_distance), + position_map(position_map), node_distance(node_distance), space(space), input_vector(input_vector), distance_limit(distance_limit), learning_constant(learning_constant), falloff_ratio(falloff_ratio) {} - void operator()(vertex_descriptor v, const Graph&) const + void operator()(vertex_descriptor v, const Graph&) const { #ifndef BOOST_NO_STDC_NAMESPACE using std::pow; @@ -77,7 +77,7 @@ struct update_position_visitor { BOOST_THROW_EXCEPTION(over_distance_limit()); Point old_position = get(position_map, v); double distance = get(node_distance, v); - double fraction = + double fraction = learning_constant * pow(falloff_ratio, distance * distance); put(position_map, v, space.move_position_toward(old_position, fraction, input_vector)); @@ -88,7 +88,7 @@ template<typename EdgeWeightMap> struct gursoy_shortest { template<typename Graph, typename NodeDistanceMap, typename UpdatePosition> - static inline void + static inline void run(const Graph& g, typename graph_traits<Graph>::vertex_descriptor s, NodeDistanceMap node_distance, UpdatePosition& update_position, EdgeWeightMap weight) @@ -104,7 +104,7 @@ template<> struct gursoy_shortest<dummy_property_map> { template<typename Graph, typename NodeDistanceMap, typename UpdatePosition> - static inline void + static inline void run(const Graph& g, typename graph_traits<Graph>::vertex_descriptor s, NodeDistanceMap node_distance, UpdatePosition& update_position, dummy_property_map) @@ -119,11 +119,11 @@ struct gursoy_shortest<dummy_property_map> } // namespace detail template <typename VertexListAndIncidenceGraph, typename Topology, - typename PositionMap, typename Diameter, typename VertexIndexMap, + typename PositionMap, typename Diameter, typename VertexIndexMap, typename EdgeWeightMap> -void +void gursoy_atun_step - (const VertexListAndIncidenceGraph& graph, + (const VertexListAndIncidenceGraph& graph, const Topology& space, PositionMap position, Diameter diameter, @@ -143,21 +143,21 @@ gursoy_atun_step typedef typename Topology::point_type point_type; vertex_iterator i, iend; std::vector<double> distance_from_input_vector(num_vertices(graph)); - typedef boost::iterator_property_map<std::vector<double>::iterator, + typedef boost::iterator_property_map<std::vector<double>::iterator, VertexIndexMap, double, double&> DistanceFromInputMap; DistanceFromInputMap distance_from_input(distance_from_input_vector.begin(), vertex_index_map); std::vector<double> node_distance_map_vector(num_vertices(graph)); - typedef boost::iterator_property_map<std::vector<double>::iterator, + typedef boost::iterator_property_map<std::vector<double>::iterator, VertexIndexMap, double, double&> NodeDistanceMap; NodeDistanceMap node_distance(node_distance_map_vector.begin(), vertex_index_map); point_type input_vector = space.random_point(); - vertex_descriptor min_distance_loc + vertex_descriptor min_distance_loc = graph_traits<VertexListAndIncidenceGraph>::null_vertex(); double min_distance = 0.0; bool min_distance_unset = true; @@ -173,24 +173,24 @@ gursoy_atun_step BOOST_ASSERT (!min_distance_unset); // Graph must have at least one vertex boost::detail::update_position_visitor< PositionMap, NodeDistanceMap, Topology, - VertexListAndIncidenceGraph> + VertexListAndIncidenceGraph> update_position(position, node_distance, space, - input_vector, diameter, learning_constant, + input_vector, diameter, learning_constant, exp(-1. / (2 * diameter * diameter))); std::fill(node_distance_map_vector.begin(), node_distance_map_vector.end(), 0); try { typedef detail::gursoy_shortest<EdgeWeightMap> shortest; shortest::run(graph, min_distance_loc, node_distance, update_position, - weight); - } catch (detail::over_distance_limit) { - /* Thrown to break out of BFS or Dijkstra early */ + weight); + } catch (detail::over_distance_limit) { + /* Thrown to break out of BFS or Dijkstra early */ } } template <typename VertexListAndIncidenceGraph, typename Topology, - typename PositionMap, typename VertexIndexMap, + typename PositionMap, typename VertexIndexMap, typename EdgeWeightMap> -void gursoy_atun_refine(const VertexListAndIncidenceGraph& graph, +void gursoy_atun_refine(const VertexListAndIncidenceGraph& graph, const Topology& space, PositionMap position, int nsteps, @@ -199,7 +199,7 @@ void gursoy_atun_refine(const VertexListAndIncidenceGraph& graph, double learning_constant_initial, double learning_constant_final, VertexIndexMap vertex_index_map, - EdgeWeightMap weight) + EdgeWeightMap weight) { #ifndef BOOST_NO_STDC_NAMESPACE using std::pow; @@ -213,17 +213,17 @@ void gursoy_atun_refine(const VertexListAndIncidenceGraph& graph, typedef typename Topology::point_type point_type; vertex_iterator i, iend; double diameter_ratio = (double)diameter_final / diameter_initial; - double learning_constant_ratio = + double learning_constant_ratio = learning_constant_final / learning_constant_initial; std::vector<double> distance_from_input_vector(num_vertices(graph)); - typedef boost::iterator_property_map<std::vector<double>::iterator, + typedef boost::iterator_property_map<std::vector<double>::iterator, VertexIndexMap, double, double&> DistanceFromInputMap; DistanceFromInputMap distance_from_input(distance_from_input_vector.begin(), vertex_index_map); std::vector<int> node_distance_map_vector(num_vertices(graph)); - typedef boost::iterator_property_map<std::vector<int>::iterator, + typedef boost::iterator_property_map<std::vector<int>::iterator, VertexIndexMap, double, double&> NodeDistanceMap; NodeDistanceMap node_distance(node_distance_map_vector.begin(), @@ -231,17 +231,17 @@ void gursoy_atun_refine(const VertexListAndIncidenceGraph& graph, for (int round = 0; round < nsteps; ++round) { double part_done = (double)round / (nsteps - 1); int diameter = (int)(diameter_initial * pow(diameter_ratio, part_done)); - double learning_constant = + double learning_constant = learning_constant_initial * pow(learning_constant_ratio, part_done); - gursoy_atun_step(graph, space, position, diameter, learning_constant, + gursoy_atun_step(graph, space, position, diameter, learning_constant, vertex_index_map, weight); } } template <typename VertexListAndIncidenceGraph, typename Topology, - typename PositionMap, typename VertexIndexMap, + typename PositionMap, typename VertexIndexMap, typename EdgeWeightMap> -void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, +void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, const Topology& space, PositionMap position, int nsteps, @@ -260,14 +260,14 @@ void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, } gursoy_atun_refine(graph, space, position, nsteps, - diameter_initial, diameter_final, + diameter_initial, diameter_final, learning_constant_initial, learning_constant_final, vertex_index_map, weight); } template <typename VertexListAndIncidenceGraph, typename Topology, typename PositionMap, typename VertexIndexMap> -void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, +void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, const Topology& space, PositionMap position, int nsteps, @@ -277,15 +277,15 @@ void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, double learning_constant_final, VertexIndexMap vertex_index_map) { - gursoy_atun_layout(graph, space, position, nsteps, - diameter_initial, diameter_final, - learning_constant_initial, learning_constant_final, + gursoy_atun_layout(graph, space, position, nsteps, + diameter_initial, diameter_final, + learning_constant_initial, learning_constant_final, vertex_index_map, dummy_property_map()); } template <typename VertexListAndIncidenceGraph, typename Topology, typename PositionMap> -void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, +void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, const Topology& space, PositionMap position, int nsteps, @@ -293,15 +293,15 @@ void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, double diameter_final = 1.0, double learning_constant_initial = 0.8, double learning_constant_final = 0.2) -{ +{ gursoy_atun_layout(graph, space, position, nsteps, diameter_initial, diameter_final, learning_constant_initial, - learning_constant_final, get(vertex_index, graph)); + learning_constant_final, get(vertex_index, graph)); } template <typename VertexListAndIncidenceGraph, typename Topology, typename PositionMap> -void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, +void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, const Topology& space, PositionMap position, int nsteps) @@ -310,13 +310,13 @@ void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, using std::sqrt; #endif - gursoy_atun_layout(graph, space, position, nsteps, + gursoy_atun_layout(graph, space, position, nsteps, sqrt((double)num_vertices(graph))); } template <typename VertexListAndIncidenceGraph, typename Topology, typename PositionMap> -void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, +void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, const Topology& space, PositionMap position) { @@ -325,8 +325,8 @@ void gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, template<typename VertexListAndIncidenceGraph, typename Topology, typename PositionMap, typename P, typename T, typename R> -void -gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, +void +gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, const Topology& space, PositionMap position, const bgl_named_params<P,T,R>& params) @@ -340,17 +340,17 @@ gursoy_atun_layout(const VertexListAndIncidenceGraph& graph, gursoy_atun_layout(graph, space, position, choose_param(get_param(params, iterations_t()), num_vertices(graph)), - choose_param(get_param(params, diameter_range_t()), + choose_param(get_param(params, diameter_range_t()), diam).first, - choose_param(get_param(params, diameter_range_t()), + choose_param(get_param(params, diameter_range_t()), diam).second, - choose_param(get_param(params, learning_constant_range_t()), + choose_param(get_param(params, learning_constant_range_t()), learn).first, - choose_param(get_param(params, learning_constant_range_t()), + choose_param(get_param(params, learning_constant_range_t()), learn).second, choose_const_pmap(get_param(params, vertex_index), graph, vertex_index), - choose_param(get_param(params, edge_weight), + choose_param(get_param(params, edge_weight), dummy_property_map())); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/incremental_components.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/incremental_components.hpp index 63a9b838..fff3a324 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/incremental_components.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/incremental_components.hpp @@ -46,11 +46,11 @@ namespace boost { // Algorithms", and the application to connected components is // similar to the algorithm described in Ch. 22 of "Intro to // Algorithms" by Cormen, et. all. - // + // // An implementation of disjoint sets can be found in // boost/pending/disjoint_sets.hpp - + template <class EdgeListGraph, class DisjointSets> void incremental_components(EdgeListGraph& g, DisjointSets& ds) { @@ -58,35 +58,35 @@ namespace boost { for (boost::tie(e,end) = edges(g); e != end; ++e) ds.union_set(source(*e,g),target(*e,g)); } - + template <class ParentIterator> void compress_components(ParentIterator first, ParentIterator last) { - for (ParentIterator current = first; current != last; ++current) + for (ParentIterator current = first; current != last; ++current) detail::find_representative_with_full_compression(first, current-first); } - + template <class ParentIterator> typename boost::detail::iterator_traits<ParentIterator>::difference_type component_count(ParentIterator first, ParentIterator last) { std::ptrdiff_t count = 0; - for (ParentIterator current = first; current != last; ++current) - if (*current == current - first) ++count; + for (ParentIterator current = first; current != last; ++current) + if (*current == current - first) ++count; return count; } - + // This algorithm can be applied to the result container of the // connected_components algorithm to normalize // the components. template <class ParentIterator> void normalize_components(ParentIterator first, ParentIterator last) { - for (ParentIterator current = first; current != last; ++current) + for (ParentIterator current = first; current != last; ++current) detail::normalize_node(first, current - first); } - - template <class VertexListGraph, class DisjointSets> + + template <class VertexListGraph, class DisjointSets> void initialize_incremental_components(VertexListGraph& G, DisjointSets& ds) { typename graph_traits<VertexListGraph> @@ -129,7 +129,7 @@ namespace boost { m_index_list(make_shared<IndexContainer>(m_num_elements)) { build_index_lists(parent_start, index_map); - + } // component_index template <typename ParentIterator> @@ -222,10 +222,10 @@ namespace boost { protected: IndexType m_num_elements; - std::shared_ptr<IndexContainer> m_components, m_index_list; + shared_ptr<IndexContainer> m_components, m_index_list; }; // class component_index - + } // namespace boost #endif // BOOST_INCREMENTAL_COMPONENTS_HPP diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/mcgregor_common_subgraphs.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/mcgregor_common_subgraphs.hpp index ed811172..c46f7215 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/mcgregor_common_subgraphs.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/mcgregor_common_subgraphs.hpp @@ -35,13 +35,13 @@ namespace boost { struct mcgregor_common_subgraph_traits { typedef typename graph_traits<GraphFirst>::vertex_descriptor vertex_first_type; typedef typename graph_traits<GraphSecond>::vertex_descriptor vertex_second_type; - + typedef shared_array_property_map<vertex_second_type, VertexIndexMapFirst> correspondence_map_first_to_second_type; - + typedef shared_array_property_map<vertex_first_type, VertexIndexMapSecond> correspondence_map_second_to_first_type; - }; + }; } // namespace detail @@ -52,7 +52,7 @@ namespace boost { template <typename PropertyMapFirst, typename PropertyMapSecond> struct property_map_equivalent { - + property_map_equivalent(const PropertyMapFirst property_map1, const PropertyMapSecond property_map2) : m_property_map1(property_map1), @@ -63,7 +63,7 @@ namespace boost { bool operator()(const ItemFirst item1, const ItemSecond item2) { return (get(m_property_map1, item1) == get(m_property_map2, item2)); } - + private: const PropertyMapFirst m_property_map1; const PropertyMapSecond m_property_map2; @@ -86,7 +86,7 @@ namespace boost { // Binary function object that always returns true. Used when // vertices or edges are always equivalent (i.e. have no labels). struct always_equivalent { - + template <typename ItemFirst, typename ItemSecond> bool operator()(const ItemFirst&, const ItemSecond&) { @@ -123,7 +123,7 @@ namespace boost { { typedef typename graph_traits<GraphFirst>::vertex_descriptor VertexFirst; typedef typename graph_traits<GraphSecond>::vertex_descriptor VertexSecond; - + typedef typename graph_traits<GraphFirst>::edge_descriptor EdgeFirst; typedef typename graph_traits<GraphSecond>::edge_descriptor EdgeSecond; @@ -153,7 +153,7 @@ namespace boost { // first matching edge is always chosen. EdgeFirst edge_to_new1, edge_from_new1; bool edge_to_new_exists1 = false, edge_from_new_exists1 = false; - + EdgeSecond edge_to_new2, edge_from_new2; bool edge_to_new_exists2 = false, edge_from_new_exists2 = false; @@ -179,7 +179,7 @@ namespace boost { if ((edge_to_new_exists1 != edge_to_new_exists2) || ((edge_to_new_exists1 && edge_to_new_exists2) && !edges_equivalent(edge_to_new1, edge_to_new2))) { - + return (false); } @@ -225,7 +225,7 @@ namespace boost { if ((edge_from_new_exists1 != edge_from_new_exists2) || ((edge_from_new_exists1 && edge_from_new_exists2) && !edges_equivalent(edge_from_new1, edge_from_new2))) { - + return (false); } @@ -244,7 +244,7 @@ namespace boost { } return (true); - } + } // Recursive method that does a depth-first search in the space of // potential subgraphs. At each level, every new vertex pair from @@ -284,14 +284,14 @@ namespace boost { // Get iterators for vertices from both graphs typename graph_traits<GraphFirst>::vertex_iterator vertex1_iter, vertex1_end; - + typename graph_traits<GraphSecond>::vertex_iterator vertex2_begin, vertex2_end, vertex2_iter; - + boost::tie(vertex1_iter, vertex1_end) = vertices(graph1); boost::tie(vertex2_begin, vertex2_end) = vertices(graph2); vertex2_iter = vertex2_begin; - + // Iterate until all vertices have been visited BGL_FORALL_VERTICES_T(new_vertex1, graph1, GraphFirst) { @@ -301,7 +301,7 @@ namespace boost { if (existing_vertex2 != graph_traits<GraphSecond>::null_vertex()) { continue; } - + BGL_FORALL_VERTICES_T(new_vertex2, graph2, GraphSecond) { VertexFirst existing_vertex1 = get(correspondence_map_2_to_1, new_vertex2); @@ -330,7 +330,7 @@ namespace boost { // Only output sub-graphs larger than a single vertex if (new_graph_size > 1) { - + // Returning false from the callback will cancel iteration if (!subgraph_callback(correspondence_map_1_to_2, correspondence_map_2_to_1, @@ -338,7 +338,7 @@ namespace boost { return (false); } } - + // Depth-first search into the state space of possible sub-graphs bool continue_iteration = mcgregor_common_subgraphs_internal @@ -352,10 +352,10 @@ namespace boost { if (!continue_iteration) { return (false); } - + // Restore previous state if (vertex_stack1.size() > old_graph_size) { - + VertexFirst stack_vertex1 = vertex_stack1.top(); VertexSecond stack_vertex2 = get(correspondence_map_1_to_2, stack_vertex1); @@ -363,10 +363,10 @@ namespace boost { // Contract subgraph put(correspondence_map_1_to_2, stack_vertex1, graph_traits<GraphSecond>::null_vertex()); - + put(correspondence_map_2_to_1, stack_vertex2, graph_traits<GraphFirst>::null_vertex()); - + vertex_stack1.pop(); } @@ -401,7 +401,7 @@ namespace boost { typedef mcgregor_common_subgraph_traits<GraphFirst, GraphSecond, VertexIndexMapFirst, VertexIndexMapSecond> SubGraphTraits; - + typename SubGraphTraits::correspondence_map_first_to_second_type correspondence_map_1_to_2(num_vertices(graph1), vindex_map1); @@ -409,7 +409,7 @@ namespace boost { put(correspondence_map_1_to_2, vertex1, graph_traits<GraphSecond>::null_vertex()); } - + typename SubGraphTraits::correspondence_map_second_to_first_type correspondence_map_2_to_1(num_vertices(graph2), vindex_map2); @@ -420,7 +420,7 @@ namespace boost { typedef typename graph_traits<GraphFirst>::vertex_descriptor VertexFirst; - + std::stack<VertexFirst> vertex_stack1; mcgregor_common_subgraphs_internal @@ -432,7 +432,7 @@ namespace boost { only_connected_subgraphs, subgraph_callback); } - + } // namespace detail // ========================================================================== @@ -457,7 +457,7 @@ namespace boost { bool only_connected_subgraphs, SubGraphCallback user_callback) { - + detail::mcgregor_common_subgraphs_internal_init (graph1, graph2, vindex_map1, vindex_map2, @@ -465,7 +465,7 @@ namespace boost { only_connected_subgraphs, user_callback); } - + // Variant of mcgregor_common_subgraphs with all default parameters template <typename GraphFirst, typename GraphSecond, @@ -476,7 +476,7 @@ namespace boost { bool only_connected_subgraphs, SubGraphCallback user_callback) { - + detail::mcgregor_common_subgraphs_internal_init (graph1, graph2, get(vertex_index, graph1), get(vertex_index, graph2), @@ -498,7 +498,7 @@ namespace boost { SubGraphCallback user_callback, const bgl_named_params<Param, Tag, Rest>& params) { - + detail::mcgregor_common_subgraphs_internal_init (graph1, graph2, choose_const_pmap(get_param(params, vertex_index1), @@ -532,7 +532,7 @@ namespace boost { typedef mcgregor_common_subgraph_traits<GraphFirst, GraphSecond, VertexIndexMapFirst, VertexIndexMapSecond> SubGraphTraits; - + typedef typename SubGraphTraits::correspondence_map_first_to_second_type CachedCorrespondenceMapFirstToSecond; @@ -542,19 +542,19 @@ namespace boost { typedef std::pair<VertexSizeFirst, std::pair<CachedCorrespondenceMapFirstToSecond, CachedCorrespondenceMapSecondToFirst> > SubGraph; - + typedef std::vector<SubGraph> SubGraphList; unique_subgraph_interceptor(const GraphFirst& graph1, const GraphSecond& graph2, const VertexIndexMapFirst vindex_map1, const VertexIndexMapSecond vindex_map2, - SubGraphCallback user_callback) : + SubGraphCallback user_callback) : m_graph1(graph1), m_graph2(graph2), m_vindex_map1(vindex_map1), m_vindex_map2(vindex_map2), m_subgraphs(make_shared<SubGraphList>()), m_user_callback(user_callback) { } - + template <typename CorrespondenceMapFirstToSecond, typename CorrespondenceMapSecondToFirst> bool operator()(CorrespondenceMapFirstToSecond correspondence_map_1_to_2, @@ -572,16 +572,16 @@ namespace boost { if (subgraph_size != subgraph_cached.first) { continue; } - + if (!are_property_maps_different(correspondence_map_1_to_2, subgraph_cached.second.first, m_graph1)) { - + // New subgraph is a duplicate return (true); } } - + // Subgraph is unique, so make a cached copy CachedCorrespondenceMapFirstToSecond new_subgraph_1_to_2 = CachedCorrespondenceMapFirstToSecond @@ -602,21 +602,21 @@ namespace boost { m_subgraphs->push_back(std::make_pair(subgraph_size, std::make_pair(new_subgraph_1_to_2, new_subgraph_2_to_1))); - + return (m_user_callback(correspondence_map_1_to_2, correspondence_map_2_to_1, subgraph_size)); } - + private: const GraphFirst& m_graph1; const GraphFirst& m_graph2; const VertexIndexMapFirst m_vindex_map1; const VertexIndexMapSecond m_vindex_map2; - std::shared_ptr<SubGraphList> m_subgraphs; + shared_ptr<SubGraphList> m_subgraphs; SubGraphCallback m_user_callback; }; - + } // namespace detail // Enumerates all unique common subgraphs between graph1 and graph2. @@ -645,7 +645,7 @@ namespace boost { (graph1, graph2, vindex_map1, vindex_map2, user_callback); - + detail::mcgregor_common_subgraphs_internal_init (graph1, graph2, vindex_map1, vindex_map2, @@ -717,7 +717,7 @@ namespace boost { typedef mcgregor_common_subgraph_traits<GraphFirst, GraphSecond, VertexIndexMapFirst, VertexIndexMapSecond> SubGraphTraits; - + typedef typename SubGraphTraits::correspondence_map_first_to_second_type CachedCorrespondenceMapFirstToSecond; @@ -753,7 +753,7 @@ namespace boost { } if (subgraph_size == *m_largest_size_so_far) { - + // Make a cached copy CachedCorrespondenceMapFirstToSecond new_subgraph_1_to_2 = CachedCorrespondenceMapFirstToSecond @@ -797,11 +797,11 @@ namespace boost { const GraphFirst& m_graph2; const VertexIndexMapFirst m_vindex_map1; const VertexIndexMapSecond m_vindex_map2; - std::shared_ptr<SubGraphList> m_subgraphs; - std::shared_ptr<VertexSizeFirst> m_largest_size_so_far; + shared_ptr<SubGraphList> m_subgraphs; + shared_ptr<VertexSizeFirst> m_largest_size_so_far; SubGraphCallback m_user_callback; }; - + } // namespace detail // Enumerates the largest common subgraphs found between graph1 @@ -828,7 +828,7 @@ namespace boost { VertexIndexMapFirst, VertexIndexMapSecond, SubGraphCallback> max_interceptor (graph1, graph2, vindex_map1, vindex_map2, user_callback); - + detail::mcgregor_common_subgraphs_internal_init (graph1, graph2, vindex_map1, vindex_map2, @@ -903,7 +903,7 @@ namespace boost { typedef mcgregor_common_subgraph_traits<GraphFirst, GraphSecond, VertexIndexMapFirst, VertexIndexMapSecond> SubGraphTraits; - + typedef typename SubGraphTraits::correspondence_map_first_to_second_type CachedCorrespondenceMapFirstToSecond; @@ -920,13 +920,13 @@ namespace boost { const GraphSecond& graph2, const VertexIndexMapFirst vindex_map1, const VertexIndexMapSecond vindex_map2, - SubGraphCallback user_callback) : + SubGraphCallback user_callback) : m_graph1(graph1), m_graph2(graph2), m_vindex_map1(vindex_map1), m_vindex_map2(vindex_map2), m_subgraphs(make_shared<SubGraphList>()), m_largest_size_so_far(make_shared<VertexSizeFirst>(0)), - m_user_callback(user_callback) { } - + m_user_callback(user_callback) { } + template <typename CorrespondenceMapFirstToSecond, typename CorrespondenceMapSecondToFirst> bool operator()(CorrespondenceMapFirstToSecond correspondence_map_1_to_2, @@ -945,18 +945,18 @@ namespace boost { subgraph_iter = m_subgraphs->begin(); subgraph_iter != m_subgraphs->end(); ++subgraph_iter) { - + SubGraph subgraph_cached = *subgraph_iter; - + if (!are_property_maps_different(correspondence_map_1_to_2, subgraph_cached.second.first, m_graph1)) { - + // New subgraph is a duplicate return (true); } } - + // Subgraph is unique, so make a cached copy CachedCorrespondenceMapFirstToSecond new_subgraph_1_to_2 = CachedCorrespondenceMapFirstToSecond @@ -978,7 +978,7 @@ namespace boost { std::make_pair(new_subgraph_1_to_2, new_subgraph_2_to_1))); } - + return (true); } @@ -994,17 +994,17 @@ namespace boost { subgraph_cached.first); } } - + private: const GraphFirst& m_graph1; const GraphFirst& m_graph2; const VertexIndexMapFirst m_vindex_map1; const VertexIndexMapSecond m_vindex_map2; - std::shared_ptr<SubGraphList> m_subgraphs; - std::shared_ptr<VertexSizeFirst> m_largest_size_so_far; + shared_ptr<SubGraphList> m_subgraphs; + shared_ptr<VertexSizeFirst> m_largest_size_so_far; SubGraphCallback m_user_callback; }; - + } // namespace detail // Enumerates the largest, unique common subgraphs found between @@ -1031,7 +1031,7 @@ namespace boost { VertexIndexMapFirst, VertexIndexMapSecond, SubGraphCallback> unique_max_interceptor (graph1, graph2, vindex_map1, vindex_map2, user_callback); - + detail::mcgregor_common_subgraphs_internal_init (graph1, graph2, vindex_map1, vindex_map2, @@ -1122,7 +1122,7 @@ namespace boost { // Returns a filtered sub-graph of graph whose edge and vertex // inclusion is dictated by membership_map. template <typename Graph, - typename MembershipMap> + typename MembershipMap> typename membership_filtered_graph_traits<Graph, MembershipMap>::graph_type make_membership_filtered_graph (const Graph& graph, @@ -1134,9 +1134,9 @@ namespace boost { typename MFGTraits::vertex_filter_type v_filter(membership_map); return (MembershipFilteredGraph(graph, keep_all(), v_filter)); - + } - + } // namespace boost #endif // BOOST_GRAPH_MCGREGOR_COMMON_SUBGRAPHS_HPP diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/metric_tsp_approx.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/metric_tsp_approx.hpp index e3824666..dd0ff1d6 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/metric_tsp_approx.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/metric_tsp_approx.hpp @@ -28,7 +28,7 @@ #include <vector> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/concept_check.hpp> #include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_as_tree.hpp> diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/parallel/distribution.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/parallel/distribution.hpp index 51f820bd..8256b197 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/parallel/distribution.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/parallel/distribution.hpp @@ -21,7 +21,7 @@ #include <boost/assert.hpp> #include <boost/iterator/counting_iterator.hpp> #include <boost/random/uniform_int.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <typeinfo> namespace boost { namespace parallel { @@ -86,13 +86,13 @@ public: size_type block_size(process_id_type id, size_type n) const { return distribution_->block_size(id, n); } - + process_id_type operator()(size_type i) const { return distribution_->in_process(i); } - + size_type local(size_type i) const { return distribution_->local(i); } - + size_type global(size_type n) const { return distribution_->global(n); } @@ -122,13 +122,13 @@ public: } private: - std::shared_ptr<basic_distribution> distribution_; + shared_ptr<basic_distribution> distribution_; }; struct block { template<typename LinearProcessGroup> - explicit block(const LinearProcessGroup& pg, std::size_t n) + explicit block(const LinearProcessGroup& pg, std::size_t n) : id(process_id(pg)), p(num_processes(pg)), n(n) { } // If there are n elements in the distributed data structure, returns the number of elements stored locally. @@ -144,7 +144,7 @@ struct block // Returns the processor on which element with global index i is stored template<typename SizeType> SizeType operator()(SizeType i) const - { + { SizeType cutoff_processor = n % p; SizeType cutoff = cutoff_processor * (n / p + 1); @@ -165,7 +165,7 @@ struct block // Find the local index for the ith global element template<typename SizeType> SizeType local(SizeType i) const - { + { SizeType owner = (*this)(i); return i - start(owner); } @@ -192,9 +192,9 @@ struct uneven_block typedef std::vector<std::size_t> size_vector; template<typename LinearProcessGroup> - explicit uneven_block(const LinearProcessGroup& pg, const std::vector<std::size_t>& local_sizes) + explicit uneven_block(const LinearProcessGroup& pg, const std::vector<std::size_t>& local_sizes) : id(process_id(pg)), p(num_processes(pg)), local_sizes(local_sizes) - { + { BOOST_ASSERT(local_sizes.size() == p); local_starts.resize(p + 1); local_starts[0] = 0; @@ -204,7 +204,7 @@ struct uneven_block // To do maybe: enter local size in each process and gather in constructor (much handier) // template<typename LinearProcessGroup> - // explicit uneven_block(const LinearProcessGroup& pg, std::size_t my_local_size) + // explicit uneven_block(const LinearProcessGroup& pg, std::size_t my_local_size) // If there are n elements in the distributed data structure, returns the number of elements stored locally. template<typename SizeType> @@ -227,7 +227,7 @@ struct uneven_block // Find the starting index for processor with the given id template<typename ID> - std::size_t start(ID id) const + std::size_t start(ID id) const { return local_starts[id]; } @@ -235,7 +235,7 @@ struct uneven_block // Find the local index for the ith global element template<typename SizeType> SizeType local(SizeType i) const - { + { SizeType owner = (*this)(i); return i - start(owner); } @@ -264,10 +264,10 @@ struct oned_block_cyclic template<typename LinearProcessGroup> explicit oned_block_cyclic(const LinearProcessGroup& pg, std::size_t size) : id(process_id(pg)), p(num_processes(pg)), size(size) { } - + template<typename SizeType> SizeType block_size(SizeType n) const - { + { return block_size(id, n); } @@ -279,20 +279,20 @@ struct oned_block_cyclic SizeType everyone_gets = all_blocks / p; SizeType extra_blocks = all_blocks % p; SizeType my_blocks = everyone_gets + (p < extra_blocks? 1 : 0); - SizeType my_elements = my_blocks * size + SizeType my_elements = my_blocks * size + (p == extra_blocks? extra_elements : 0); return my_elements; } template<typename SizeType> SizeType operator()(SizeType i) const - { + { return (i / size) % p; } template<typename SizeType> SizeType local(SizeType i) const - { + { return ((i / size) / p) * size + i % size; } @@ -302,7 +302,7 @@ struct oned_block_cyclic template<typename ProcessID, typename SizeType> SizeType global(ProcessID id, SizeType i) const - { + { return ((i / size) * p + id) * size + i % size; } @@ -318,14 +318,14 @@ struct twod_block_cyclic explicit twod_block_cyclic(const LinearProcessGroup& pg, std::size_t block_rows, std::size_t block_columns, std::size_t data_columns_per_row) - : id(process_id(pg)), p(num_processes(pg)), - block_rows(block_rows), block_columns(block_columns), + : id(process_id(pg)), p(num_processes(pg)), + block_rows(block_rows), block_columns(block_columns), data_columns_per_row(data_columns_per_row) { } - + template<typename SizeType> SizeType block_size(SizeType n) const - { + { return block_size(id, n); } @@ -346,7 +346,7 @@ struct twod_block_cyclic template<typename SizeType> SizeType operator()(SizeType i) const - { + { SizeType result = get_block_num(i) % p; // std::cerr << "Item " << i << " goes on processor " << result << std::endl; return result; @@ -354,7 +354,7 @@ struct twod_block_cyclic template<typename SizeType> SizeType local(SizeType i) const - { + { // Compute the start of the block std::size_t block_num = get_block_num(i); // std::cerr << "Item " << i << " is in block #" << block_num << std::endl; @@ -362,11 +362,11 @@ struct twod_block_cyclic std::size_t local_block_num = block_num / p; std::size_t block_start = local_block_num * block_rows * block_columns; - // Compute the offset into the block + // Compute the offset into the block std::size_t data_row = i / data_columns_per_row; std::size_t data_col = i % data_columns_per_row; - std::size_t block_offset = (data_row % block_rows) * block_columns - + (data_col % block_columns); + std::size_t block_offset = (data_row % block_rows) * block_columns + + (data_col % block_columns); // std::cerr << "Item " << i << " maps to local index " << block_start+block_offset << std::endl; return block_start + block_offset; @@ -374,7 +374,7 @@ struct twod_block_cyclic template<typename SizeType> SizeType global(SizeType i) const - { + { // Compute the (global) block in which this element resides SizeType local_block_num = i / (block_rows * block_columns); SizeType block_offset = i % (block_rows * block_columns); @@ -401,7 +401,7 @@ struct twod_block_cyclic + row_in_block * block_rows + col_in_block; - std::cerr << "global(" << i << "@" << id << ") = " << result + std::cerr << "global(" << i << "@" << id << ") = " << result << " =? " << local(result) << std::endl; BOOST_ASSERT(i == local(result)); return result; @@ -444,7 +444,7 @@ class twod_random private: RandomNumberGen& gen; }; - + public: template<typename LinearProcessGroup, typename RandomNumberGen> explicit twod_random(const LinearProcessGroup& pg, @@ -452,11 +452,11 @@ class twod_random std::size_t data_columns_per_row, std::size_t n, RandomNumberGen& gen) - : id(process_id(pg)), p(num_processes(pg)), - block_rows(block_rows), block_columns(block_columns), + : id(process_id(pg)), p(num_processes(pg)), + block_rows(block_rows), block_columns(block_columns), data_columns_per_row(data_columns_per_row), global_to_local(n / (block_rows * block_columns)) - { + { std::copy(make_counting_iterator(std::size_t(0)), make_counting_iterator(global_to_local.size()), global_to_local.begin()); @@ -464,10 +464,10 @@ class twod_random random_int<RandomNumberGen> rand(gen); std::random_shuffle(global_to_local.begin(), global_to_local.end(), rand); } - + template<typename SizeType> SizeType block_size(SizeType n) const - { + { return block_size(id, n); } @@ -488,7 +488,7 @@ class twod_random template<typename SizeType> SizeType operator()(SizeType i) const - { + { SizeType result = get_block_num(i) % p; // std::cerr << "Item " << i << " goes on processor " << result << std::endl; return result; @@ -496,7 +496,7 @@ class twod_random template<typename SizeType> SizeType local(SizeType i) const - { + { // Compute the start of the block std::size_t block_num = get_block_num(i); // std::cerr << "Item " << i << " is in block #" << block_num << std::endl; @@ -504,11 +504,11 @@ class twod_random std::size_t local_block_num = block_num / p; std::size_t block_start = local_block_num * block_rows * block_columns; - // Compute the offset into the block + // Compute the offset into the block std::size_t data_row = i / data_columns_per_row; std::size_t data_col = i % data_columns_per_row; - std::size_t block_offset = (data_row % block_rows) * block_columns - + (data_col % block_columns); + std::size_t block_offset = (data_row % block_rows) * block_columns + + (data_col % block_columns); // std::cerr << "Item " << i << " maps to local index " << block_start+block_offset << std::endl; return block_start + block_offset; @@ -552,7 +552,7 @@ class random_distribution private: RandomNumberGen& gen; }; - + public: template<typename LinearProcessGroup, typename RandomNumberGen> random_distribution(const LinearProcessGroup& pg, RandomNumberGen& gen, @@ -565,7 +565,7 @@ class random_distribution random_int<RandomNumberGen> rand(gen); std::random_shuffle(local_to_global.begin(), local_to_global.end(), rand); - + for (std::vector<std::size_t>::size_type i = 0; i < n; ++i) global_to_local[local_to_global[i]] = i; @@ -587,19 +587,19 @@ class random_distribution template<typename SizeType> SizeType local(SizeType i) const - { + { return base.local(global_to_local[i]); } template<typename ProcessID, typename SizeType> SizeType global(ProcessID p, SizeType i) const - { + { return local_to_global[base.global(p, i)]; } template<typename SizeType> SizeType global(SizeType i) const - { + { return local_to_global[base.global(i)]; } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/planar_detail/boyer_myrvold_impl.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/planar_detail/boyer_myrvold_impl.hpp index 0eb76e21..41ba2bc5 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/planar_detail/boyer_myrvold_impl.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/planar_detail/boyer_myrvold_impl.hpp @@ -12,7 +12,7 @@ #include <list> #include <boost/next_prior.hpp> #include <boost/config.hpp> //for std::min macros -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/tuple/tuple.hpp> #include <boost/property_map/property_map.hpp> #include <boost/graph/graph_traits.hpp> @@ -34,26 +34,26 @@ namespace boost typename DFSParentEdgeMap, typename SizeType> struct planar_dfs_visitor : public dfs_visitor<> { - planar_dfs_visitor(LowPointMap lpm, DFSParentMap dfs_p, + planar_dfs_visitor(LowPointMap lpm, DFSParentMap dfs_p, DFSNumberMap dfs_n, LeastAncestorMap lam, - DFSParentEdgeMap dfs_edge) + DFSParentEdgeMap dfs_edge) : low(lpm), parent(dfs_p), df_number(dfs_n), least_ancestor(lam), df_edge(dfs_edge), - count(0) + count(0) {} - - + + template <typename Vertex, typename Graph> void start_vertex(const Vertex& u, Graph&) { put(parent, u, u); put(least_ancestor, u, count); } - - + + template <typename Vertex, typename Graph> void discover_vertex(const Vertex& u, Graph&) { @@ -61,7 +61,7 @@ namespace boost put(df_number, u, count); ++count; } - + template <typename Edge, typename Graph> void tree_edge(const Edge& e, Graph& g) { @@ -73,13 +73,13 @@ namespace boost put(df_edge, t, e); put(least_ancestor, t, get(df_number, s)); } - + template <typename Edge, typename Graph> void back_edge(const Edge& e, Graph& g) { typedef typename graph_traits<Graph>::vertex_descriptor vertex_t; typedef typename graph_traits<Graph>::vertices_size_type v_size_t; - + vertex_t s(source(e,g)); vertex_t t(target(e,g)); BOOST_USING_STD_MIN(); @@ -89,20 +89,20 @@ namespace boost v_size_t t_df_number = get(df_number, t); v_size_t s_least_ancestor_df_number = get(least_ancestor, s); - put(low, s, + put(low, s, min BOOST_PREVENT_MACRO_SUBSTITUTION(s_low_df_number, t_df_number) ); - - put(least_ancestor, s, - min BOOST_PREVENT_MACRO_SUBSTITUTION(s_least_ancestor_df_number, + + put(least_ancestor, s, + min BOOST_PREVENT_MACRO_SUBSTITUTION(s_least_ancestor_df_number, t_df_number ) ); } } - + template <typename Vertex, typename Graph> void finish_vertex(const Vertex& u, Graph&) { @@ -115,21 +115,21 @@ namespace boost if (u_parent != u) { - put(low, u_parent, - min BOOST_PREVENT_MACRO_SUBSTITUTION(u_lowpoint, + put(low, u_parent, + min BOOST_PREVENT_MACRO_SUBSTITUTION(u_lowpoint, u_parent_lowpoint ) ); } } - + LowPointMap low; DFSParentMap parent; DFSNumberMap df_number; LeastAncestorMap least_ancestor; DFSParentEdgeMap df_edge; SizeType count; - + }; @@ -150,7 +150,7 @@ namespace boost typedef typename graph_traits<Graph>::edge_descriptor edge_t; typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator_t; typedef typename graph_traits<Graph>::edge_iterator edge_iterator_t; - typedef typename graph_traits<Graph>::out_edge_iterator + typedef typename graph_traits<Graph>::out_edge_iterator out_edge_iterator_t; typedef graph::detail::face_handle <Graph, StoreOldHandlesPolicy, StoreEmbeddingPolicy> face_handle_t; @@ -158,8 +158,8 @@ namespace boost typedef std::vector<edge_t> edge_vector_t; typedef std::list<vertex_t> vertex_list_t; typedef std::list< face_handle_t > face_handle_list_t; - typedef boost::std::shared_ptr< face_handle_list_t > face_handle_list_ptr_t; - typedef boost::std::shared_ptr< vertex_list_t > vertex_list_ptr_t; + typedef boost::shared_ptr< face_handle_list_t > face_handle_list_ptr_t; + typedef boost::shared_ptr< vertex_list_t > vertex_list_ptr_t; typedef boost::tuple<vertex_t, bool, bool> merge_stack_frame_t; typedef std::vector<merge_stack_frame_t> merge_stack_t; @@ -173,16 +173,16 @@ namespace boost typedef typename map_vertex_to_<v_size_t>::type vertex_to_v_size_map_t; typedef typename map_vertex_to_<vertex_t>::type vertex_to_vertex_map_t; typedef typename map_vertex_to_<edge_t>::type vertex_to_edge_map_t; - typedef typename map_vertex_to_<vertex_list_ptr_t>::type + typedef typename map_vertex_to_<vertex_list_ptr_t>::type vertex_to_vertex_list_ptr_map_t; - typedef typename map_vertex_to_< edge_vector_t >::type + typedef typename map_vertex_to_< edge_vector_t >::type vertex_to_edge_vector_map_t; typedef typename map_vertex_to_<bool>::type vertex_to_bool_map_t; - typedef typename map_vertex_to_<face_handle_t>::type + typedef typename map_vertex_to_<face_handle_t>::type vertex_to_face_handle_map_t; - typedef typename map_vertex_to_<face_handle_list_ptr_t>::type + typedef typename map_vertex_to_<face_handle_list_ptr_t>::type vertex_to_face_handle_list_ptr_map_t; - typedef typename map_vertex_to_<typename vertex_list_t::iterator>::type + typedef typename map_vertex_to_<typename vertex_list_t::iterator>::type vertex_to_separated_node_map_t; template <typename BicompSideToTraverse = single_side, @@ -190,10 +190,10 @@ namespace boost typename Time = current_iteration> struct face_vertex_iterator { - typedef face_iterator<Graph, - vertex_to_face_handle_map_t, - vertex_t, - BicompSideToTraverse, + typedef face_iterator<Graph, + vertex_to_face_handle_map_t, + vertex_t, + BicompSideToTraverse, VisitorType, Time> type; @@ -216,7 +216,7 @@ namespace boost public: - + boyer_myrvold_impl(const Graph& arg_g, VertexIndexMap arg_vm): g(arg_g), @@ -237,7 +237,7 @@ namespace boost flipped_vector(num_vertices(g), false), backedges_vector(num_vertices(g)), dfs_parent_edge_vector(num_vertices(g)), - + vertices_by_dfs_num(num_vertices(g)), low_point(low_point_vector.begin(), vm), @@ -271,72 +271,72 @@ namespace boost // Sort vertices by their lowpoint - need this later in the constructor vertex_vector_t vertices_by_lowpoint(num_vertices(g)); - std::copy( vertices(g).first, vertices(g).second, + std::copy( vertices(g).first, vertices(g).second, vertices_by_lowpoint.begin() ); - bucket_sort(vertices_by_lowpoint.begin(), - vertices_by_lowpoint.end(), + bucket_sort(vertices_by_lowpoint.begin(), + vertices_by_lowpoint.end(), low_point, num_vertices(g) ); - // Sort vertices by their dfs number - need this to iterate by reverse + // Sort vertices by their dfs number - need this to iterate by reverse // DFS number in the main loop. - std::copy( vertices(g).first, vertices(g).second, + std::copy( vertices(g).first, vertices(g).second, vertices_by_dfs_num.begin() ); - bucket_sort(vertices_by_dfs_num.begin(), - vertices_by_dfs_num.end(), + bucket_sort(vertices_by_dfs_num.begin(), + vertices_by_dfs_num.end(), dfs_number, num_vertices(g) ); - // Initialize face handles. A face handle is an abstraction that serves - // two uses in our implementation - it allows us to efficiently move - // along the outer face of embedded bicomps in a partially embedded - // graph, and it provides storage for the planar embedding. Face - // handles are implemented by a sequence of edges and are associated - // with a particular vertex - the sequence of edges represents the - // current embedding of edges around that vertex, and the first and - // last edges in the sequence represent the pair of edges on the outer - // face that are adjacent to the associated vertex. This lets us embed - // edges in the graph by just pushing them on the front or back of the + // Initialize face handles. A face handle is an abstraction that serves + // two uses in our implementation - it allows us to efficiently move + // along the outer face of embedded bicomps in a partially embedded + // graph, and it provides storage for the planar embedding. Face + // handles are implemented by a sequence of edges and are associated + // with a particular vertex - the sequence of edges represents the + // current embedding of edges around that vertex, and the first and + // last edges in the sequence represent the pair of edges on the outer + // face that are adjacent to the associated vertex. This lets us embed + // edges in the graph by just pushing them on the front or back of the // sequence of edges held by the face handles. - // + // // Our algorithm starts with a DFS tree of edges (where every vertex is - // an articulation point and every edge is a singleton bicomp) and - // repeatedly merges bicomps by embedding additional edges. Note that - // any bicomp at any point in the algorithm can be associated with a + // an articulation point and every edge is a singleton bicomp) and + // repeatedly merges bicomps by embedding additional edges. Note that + // any bicomp at any point in the algorithm can be associated with a // unique edge connecting the vertex of that bicomp with the lowest DFS - // number (which we refer to as the "root" of the bicomp) with its DFS + // number (which we refer to as the "root" of the bicomp) with its DFS // child in the bicomp: the existence of two such edges would contradict - // the properties of a DFS tree. We refer to the DFS child of the root - // of a bicomp as the "canonical DFS child" of the bicomp. Note that a + // the properties of a DFS tree. We refer to the DFS child of the root + // of a bicomp as the "canonical DFS child" of the bicomp. Note that a // vertex can be the root of more than one bicomp. // - // We move around the external faces of a bicomp using a few property + // We move around the external faces of a bicomp using a few property // maps, which we'll initialize presently: // - // - face_handles: maps a vertex to a face handle that can be used to - // move "up" a bicomp. For a vertex that isn't an articulation point, - // this holds the face handles that can be used to move around that + // - face_handles: maps a vertex to a face handle that can be used to + // move "up" a bicomp. For a vertex that isn't an articulation point, + // this holds the face handles that can be used to move around that // vertex's unique bicomp. For a vertex that is an articulation point, - // this holds the face handles associated with the unique bicomp that - // the vertex is NOT the root of. These handles can therefore be used - // to move from any point on the outer face of the tree of bicomps + // this holds the face handles associated with the unique bicomp that + // the vertex is NOT the root of. These handles can therefore be used + // to move from any point on the outer face of the tree of bicomps // around the current outer face towards the root of the DFS tree. // - // - dfs_child_handles: these are used to hold face handles for + // - dfs_child_handles: these are used to hold face handles for // vertices that are articulation points - dfs_child_handles[v] holds // the face handles corresponding to vertex u in the bicomp with root // u and canonical DFS child v. // // - canonical_dfs_child: this property map allows one to determine the // canonical DFS child of a bicomp while traversing the outer face. - // This property map is only valid when applied to one of the two + // This property map is only valid when applied to one of the two // vertices adjacent to the root of the bicomp on the outer face. To // be more precise, if v is the canonical DFS child of a bicomp, - // canonical_dfs_child[dfs_child_handles[v].first_vertex()] == v and + // canonical_dfs_child[dfs_child_handles[v].first_vertex()] == v and // canonical_dfs_child[dfs_child_handles[v].second_vertex()] == v. // // - pertinent_roots: given a vertex v, pertinent_roots[v] contains a @@ -365,19 +365,19 @@ namespace boost } canonical_dfs_child[v] = v; - pertinent_roots[v] = face_handle_list_ptr_t(new face_handle_list_t); + pertinent_roots[v] = face_handle_list_ptr_t(new face_handle_list_t); separated_dfs_child_list[v] = vertex_list_ptr_t(new vertex_list_t); } // We need to create a list of not-yet-merged depth-first children for - // each vertex that will be updated as bicomps get merged. We sort each - // list by ascending lowpoint, which allows the externally_active - // function to run in constant time, and we keep a pointer to each - // vertex's representation in its parent's list, which allows merging + // each vertex that will be updated as bicomps get merged. We sort each + // list by ascending lowpoint, which allows the externally_active + // function to run in constant time, and we keep a pointer to each + // vertex's representation in its parent's list, which allows merging //in constant time. - for(typename vertex_vector_t::iterator itr = + for(typename vertex_vector_t::iterator itr = vertices_by_lowpoint.begin(); itr != vertices_by_lowpoint.end(); ++itr) { @@ -389,7 +389,7 @@ namespace boost separated_dfs_child_list[parent]->insert (separated_dfs_child_list[parent]->end(), v); } - } + } // The merge stack holds path information during a walkdown iteration merge_stack.reserve(num_vertices(g)); @@ -404,11 +404,11 @@ namespace boost bool is_planar() { - // This is the main algorithm: starting with a DFS tree of embedded - // edges (which, since it's a tree, is planar), iterate through all + // This is the main algorithm: starting with a DFS tree of embedded + // edges (which, since it's a tree, is planar), iterate through all // vertices by reverse DFS number, attempting to embed all backedges // connecting the current vertex to vertices with higher DFS numbers. - // + // // The walkup is a procedure that examines all such backedges and sets // up the required data structures so that they can be searched by the // walkdown in linear time. The walkdown does the actual work of @@ -434,7 +434,7 @@ namespace boost store_old_face_handles(StoreOldHandlesPolicy()); vertex_t v(*vi); - + walkup(v); if (!walkdown(v)) @@ -445,7 +445,7 @@ namespace boost clean_up_embedding(StoreEmbeddingPolicy()); return true; - + } @@ -462,14 +462,14 @@ namespace boost void walkup(vertex_t v) { - // The point of the walkup is to follow all backedges from v to + // The point of the walkup is to follow all backedges from v to // vertices with higher DFS numbers, and update pertinent_roots // for the bicomp roots on the path from backedge endpoints up // to v. This will set the stage for the walkdown to efficiently // traverse the graph of bicomps down from v. typedef typename face_vertex_iterator<both_sides>::type walkup_iterator_t; - + out_edge_iterator_t oi, oi_end; for(boost::tie(oi,oi_end) = out_edges(v,g); oi != oi_end; ++oi) { @@ -491,7 +491,7 @@ namespace boost backedges[w].push_back(e); - v_size_t timestamp = dfs_number[v]; + v_size_t timestamp = dfs_number[v]; backedge_flag[w] = timestamp; walkup_iterator_t walkup_itr(w, face_handles); @@ -500,11 +500,11 @@ namespace boost while (true) { - + // Move to the root of the current bicomp or the first visited // vertex on the bicomp by going up each side in parallel - - while(walkup_itr != walkup_end && + + while(walkup_itr != walkup_end && visited[*walkup_itr] != timestamp ) { @@ -515,20 +515,20 @@ namespace boost // If we've found the root of a bicomp through a path we haven't // seen before, update pertinent_roots with a handle to the - // current bicomp. Otherwise, we've just seen a path we've been + // current bicomp. Otherwise, we've just seen a path we've been // up before, so break out of the main while loop. - + if (walkup_itr == walkup_end) { vertex_t dfs_child = canonical_dfs_child[lead_vertex]; vertex_t parent = dfs_parent[dfs_child]; - visited[dfs_child_handles[dfs_child].first_vertex()] + visited[dfs_child_handles[dfs_child].first_vertex()] = timestamp; - visited[dfs_child_handles[dfs_child].second_vertex()] + visited[dfs_child_handles[dfs_child].second_vertex()] = timestamp; - if (low_point[dfs_child] < dfs_number[v] || + if (low_point[dfs_child] < dfs_number[v] || least_ancestor[dfs_child] < dfs_number[v] ) { @@ -553,10 +553,10 @@ namespace boost break; } - } - + } + } - + @@ -577,19 +577,19 @@ namespace boost while (!pertinent_roots[v]->empty()) { - + face_handle_t root_face_handle = pertinent_roots[v]->front(); face_handle_t curr_face_handle = root_face_handle; - pertinent_roots[v]->pop_front(); + pertinent_roots[v]->pop_front(); merge_stack.clear(); while(true) { - typename face_vertex_iterator<>::type + typename face_vertex_iterator<>::type first_face_itr, second_face_itr, face_end; - vertex_t first_side_vertex + vertex_t first_side_vertex = graph_traits<Graph>::null_vertex(); vertex_t second_side_vertex; vertex_t first_tail, second_tail; @@ -603,7 +603,7 @@ namespace boost for(; first_face_itr != face_end; ++first_face_itr) { vertex_t face_vertex(*first_face_itr); - if (pertinent(face_vertex, v) || + if (pertinent(face_vertex, v) || externally_active(face_vertex, v) ) { @@ -614,7 +614,7 @@ namespace boost first_tail = face_vertex; } - if (first_side_vertex == graph_traits<Graph>::null_vertex() || + if (first_side_vertex == graph_traits<Graph>::null_vertex() || first_side_vertex == curr_face_handle.get_anchor() ) break; @@ -622,7 +622,7 @@ namespace boost for(;second_face_itr != face_end; ++second_face_itr) { vertex_t face_vertex(*second_face_itr); - if (pertinent(face_vertex, v) || + if (pertinent(face_vertex, v) || externally_active(face_vertex, v) ) { @@ -654,14 +654,14 @@ namespace boost chosen = second_side_vertex; chose_first_upper_path = false; } - else + else { - // If there's a pertinent vertex on the lower face - // between the first_face_itr and the second_face_itr, + // If there's a pertinent vertex on the lower face + // between the first_face_itr and the second_face_itr, // this graph isn't planar. - for(; - *first_face_itr != second_side_vertex; + for(; + *first_face_itr != second_side_vertex; ++first_face_itr ) { @@ -675,85 +675,85 @@ namespace boost return false; } } - - // Otherwise, the fact that we didn't find a pertinent - // vertex on this face is fine - we should set the - // short-circuit edges and break out of this loop to + + // Otherwise, the fact that we didn't find a pertinent + // vertex on this face is fine - we should set the + // short-circuit edges and break out of this loop to // start looking at a different pertinent root. - + if (first_side_vertex == second_side_vertex) { if (first_tail != v) { - vertex_t first + vertex_t first = face_handles[first_tail].first_vertex(); - vertex_t second + vertex_t second = face_handles[first_tail].second_vertex(); - boost::tie(first_side_vertex, first_tail) - = make_tuple(first_tail, - first == first_side_vertex ? + boost::tie(first_side_vertex, first_tail) + = make_tuple(first_tail, + first == first_side_vertex ? second : first ); } else if (second_tail != v) { - vertex_t first + vertex_t first = face_handles[second_tail].first_vertex(); - vertex_t second + vertex_t second = face_handles[second_tail].second_vertex(); - boost::tie(second_side_vertex, second_tail) + boost::tie(second_side_vertex, second_tail) = make_tuple(second_tail, - first == second_side_vertex ? + first == second_side_vertex ? second : first); } else break; } - - canonical_dfs_child[first_side_vertex] + + canonical_dfs_child[first_side_vertex] = canonical_dfs_child[root_face_handle.first_vertex()]; - canonical_dfs_child[second_side_vertex] + canonical_dfs_child[second_side_vertex] = canonical_dfs_child[root_face_handle.second_vertex()]; root_face_handle.set_first_vertex(first_side_vertex); root_face_handle.set_second_vertex(second_side_vertex); - if (face_handles[first_side_vertex].first_vertex() == + if (face_handles[first_side_vertex].first_vertex() == first_tail ) face_handles[first_side_vertex].set_first_vertex(v); else face_handles[first_side_vertex].set_second_vertex(v); - if (face_handles[second_side_vertex].first_vertex() == + if (face_handles[second_side_vertex].first_vertex() == second_tail ) face_handles[second_side_vertex].set_first_vertex(v); else face_handles[second_side_vertex].set_second_vertex(v); - + break; - + } - // When we unwind the stack, we need to know which direction + // When we unwind the stack, we need to know which direction // we came down from on the top face handle - - bool chose_first_lower_path = - (chose_first_upper_path && - face_handles[chosen].first_vertex() == first_tail) + + bool chose_first_lower_path = + (chose_first_upper_path && + face_handles[chosen].first_vertex() == first_tail) || - (!chose_first_upper_path && + (!chose_first_upper_path && face_handles[chosen].first_vertex() == second_tail); //If there's a backedge at the chosen vertex, embed it now if (backedge_flag[chosen] == dfs_number[v]) { w = chosen; - + backedge_flag[chosen] = num_vertices(g) + 1; add_to_merge_points(chosen, StoreOldHandlesPolicy()); - + typename edge_vector_t::iterator ei, ei_end; ei_end = backedges[chosen].end(); for(ei = backedges[chosen].begin(); ei != ei_end; ++ei) @@ -778,7 +778,7 @@ namespace boost } //Unwind the merge stack to the root, merging all bicomps - + bool bottom_path_follows_first; bool top_path_follows_first; bool next_bottom_follows_first = chose_first_upper_path; @@ -790,8 +790,8 @@ namespace boost { bottom_path_follows_first = next_bottom_follows_first; - boost::tie(merge_point, - next_bottom_follows_first, + boost::tie(merge_point, + next_bottom_follows_first, top_path_follows_first ) = merge_stack.back(); merge_stack.pop_back(); @@ -799,7 +799,7 @@ namespace boost face_handle_t top_handle(face_handles[merge_point]); face_handle_t bottom_handle (*pertinent_roots[merge_point]->begin()); - + vertex_t bottom_dfs_child = canonical_dfs_child [pertinent_roots[merge_point]->begin()->first_vertex()]; @@ -810,23 +810,23 @@ namespace boost pertinent_roots[merge_point]->pop_front(); - add_to_merge_points(top_handle.get_anchor(), + add_to_merge_points(top_handle.get_anchor(), StoreOldHandlesPolicy() ); - + if (top_path_follows_first && bottom_path_follows_first) { bottom_handle.flip(); top_handle.glue_first_to_second(bottom_handle); - } - else if (!top_path_follows_first && + } + else if (!top_path_follows_first && bottom_path_follows_first ) { flipped[bottom_dfs_child] = true; top_handle.glue_second_to_first(bottom_handle); } - else if (top_path_follows_first && + else if (top_path_follows_first && !bottom_path_follows_first ) { @@ -842,17 +842,17 @@ namespace boost } //Finally, embed all edges (v,w) at their upper end points - canonical_dfs_child[w] + canonical_dfs_child[w] = canonical_dfs_child[root_face_handle.first_vertex()]; - - add_to_merge_points(root_face_handle.get_anchor(), + + add_to_merge_points(root_face_handle.get_anchor(), StoreOldHandlesPolicy() ); - + typename edge_vector_t::iterator ei, ei_end; ei_end = backedges[chosen].end(); for(ei = backedges[chosen].begin(); ei != ei_end; ++ei) - { + { if (next_bottom_follows_first) root_face_handle.push_first(*ei, g); else @@ -863,7 +863,7 @@ namespace boost curr_face_handle = root_face_handle; }//while(true) - + }//while(!pertinent_roots[v]->empty()) return true; @@ -879,14 +879,14 @@ namespace boost void store_old_face_handles(graph::detail::store_old_handles) { - for(typename std::vector<vertex_t>::iterator mp_itr + for(typename std::vector<vertex_t>::iterator mp_itr = current_merge_points.begin(); mp_itr != current_merge_points.end(); ++mp_itr) { face_handles[*mp_itr].store_old_face_handles(); } current_merge_points.clear(); - } + } void add_to_merge_points(vertex_t, graph::detail::no_old_handles) {} @@ -896,7 +896,7 @@ namespace boost current_merge_points.push_back(v); } - + void add_to_embedded_edges(edge_t, graph::detail::no_old_handles) {} void add_to_embedded_edges(edge_t e, graph::detail::store_old_handles) @@ -924,7 +924,7 @@ namespace boost { typename vertex_list_t::iterator yi, yi_end; yi_end = separated_dfs_child_list[*xi]->end(); - for(yi = separated_dfs_child_list[*xi]->begin(); + for(yi = separated_dfs_child_list[*xi]->begin(); yi != yi_end; ++yi ) { @@ -933,7 +933,7 @@ namespace boost (dfs_child_handles[*yi]); } } - } + } // Up until this point, we've flipped bicomps lazily by setting // flipped[v] to true if the bicomp rooted at v was flipped (the @@ -944,7 +944,7 @@ namespace boost typedef typename vertex_vector_t::iterator vertex_vector_itr_t; vertex_vector_itr_t vi_end = vertices_by_dfs_num.end(); - for(vertex_vector_itr_t vi = vertices_by_dfs_num.begin(); + for(vertex_vector_itr_t vi = vertices_by_dfs_num.begin(); vi != vi_end; ++vi ) { @@ -968,7 +968,7 @@ namespace boost // If there are any self-loops in the graph, they were flagged // during the walkup, and we should add them to the embedding now. - // Adding a self loop anywhere in the embedding could never + // Adding a self loop anywhere in the embedding could never // invalidate the embedding, but they would complicate the traversal // if they were added during the walkup/walkdown. @@ -979,13 +979,13 @@ namespace boost edge_t e(*ei); face_handles[source(e,g)].push_second(e,g); } - + } - + bool pertinent(vertex_t w, vertex_t v) { // w is pertinent with respect to v if there is a backedge (v,w) or if @@ -993,38 +993,38 @@ namespace boost return backedge_flag[w] == dfs_number[v] || !pertinent_roots[w]->empty(); } - + bool externally_active(vertex_t w, vertex_t v) { // Let a be any proper depth-first search ancestor of v. w is externally - // active with respect to v if there exists a backedge (a,w) or a + // active with respect to v if there exists a backedge (a,w) or a // backedge (a,w_0) for some w_0 in a descendent bicomp of w. v_size_t dfs_number_of_v = dfs_number[v]; return (least_ancestor[w] < dfs_number_of_v) || (!separated_dfs_child_list[w]->empty() && - low_point[separated_dfs_child_list[w]->front()] < dfs_number_of_v); + low_point[separated_dfs_child_list[w]->front()] < dfs_number_of_v); } + - - + bool internally_active(vertex_t w, vertex_t v) { return pertinent(w,v) && !externally_active(w,v); - } - + } + void remove_vertex_from_separated_dfs_child_list(vertex_t v) { - typename vertex_list_t::iterator to_delete + typename vertex_list_t::iterator to_delete = separated_node_in_parent_list[v]; - garbage.splice(garbage.end(), - *separated_dfs_child_list[dfs_parent[v]], - to_delete, + garbage.splice(garbage.end(), + *separated_dfs_child_list[dfs_parent[v]], + to_delete, boost::next(to_delete) ); } @@ -1032,9 +1032,9 @@ namespace boost - + // End of the implementation of the basic Boyer-Myrvold Algorithm. The rest - // of the code below implements the isolation of a Kuratowski subgraph in + // of the code below implements the isolation of a Kuratowski subgraph in // the case that the input graph is not planar. This is by far the most // complicated part of the implementation. @@ -1047,7 +1047,7 @@ namespace boost template <typename EdgeToBoolPropertyMap, typename EdgeContainer> - vertex_t kuratowski_walkup(vertex_t v, + vertex_t kuratowski_walkup(vertex_t v, EdgeToBoolPropertyMap forbidden_edge, EdgeToBoolPropertyMap goal_edge, EdgeToBoolPropertyMap is_embedded, @@ -1057,19 +1057,19 @@ namespace boost vertex_t current_endpoint; bool seen_goal_edge = false; out_edge_iterator_t oi, oi_end; - + for(boost::tie(oi,oi_end) = out_edges(v,g); oi != oi_end; ++oi) forbidden_edge[*oi] = true; - + for(boost::tie(oi,oi_end) = out_edges(v,g); oi != oi_end; ++oi) { path_edges.clear(); - + edge_t e(*oi); - current_endpoint = target(*oi,g) == v ? + current_endpoint = target(*oi,g) == v ? source(*oi,g) : target(*oi,g); - - if (dfs_number[current_endpoint] < dfs_number[v] || + + if (dfs_number[current_endpoint] < dfs_number[v] || is_embedded[e] || v == current_endpoint //self-loop ) @@ -1077,7 +1077,7 @@ namespace boost //Not a backedge continue; } - + path_edges.push_back(e); if (goal_edge[e]) { @@ -1085,30 +1085,30 @@ namespace boost } typedef typename face_edge_iterator<>::type walkup_itr_t; - - walkup_itr_t + + walkup_itr_t walkup_itr(current_endpoint, face_handles, first_side()); walkup_itr_t walkup_end; - + seen_goal_edge = false; - + while (true) - { - + { + if (walkup_itr != walkup_end && forbidden_edge[*walkup_itr]) break; - - while(walkup_itr != walkup_end && - !goal_edge[*walkup_itr] && + + while(walkup_itr != walkup_end && + !goal_edge[*walkup_itr] && !forbidden_edge[*walkup_itr] ) { edge_t f(*walkup_itr); forbidden_edge[f] = true; path_edges.push_back(f); - current_endpoint = - source(f, g) == current_endpoint ? - target(f, g) : + current_endpoint = + source(f, g) == current_endpoint ? + target(f, g) : source(f,g); ++walkup_itr; } @@ -1120,14 +1120,14 @@ namespace boost break; } - walkup_itr + walkup_itr = walkup_itr_t(current_endpoint, face_handles, first_side()); - + } - + if (seen_goal_edge) break; - + } if (seen_goal_edge) @@ -1157,9 +1157,9 @@ namespace boost // | there exists some bicomp containing three vertices // ----- x,y, and z as shown such that x and y are externally // | | active with respect to v (which means that there are - // x y two vertices x_0 and y_0 such that (1) both x_0 and - // | | y_0 are proper depth-first search ancestors of v and - // --z-- (2) there are two disjoint paths, one connecting x + // x y two vertices x_0 and y_0 such that (1) both x_0 and + // | | y_0 are proper depth-first search ancestors of v and + // --z-- (2) there are two disjoint paths, one connecting x // and x_0 and one connecting y and y_0, both consisting // fig. 1 entirely of unembedded edges). Furthermore, there // exists a vertex z_0 such that z is a depth-first @@ -1175,10 +1175,10 @@ namespace boost // properties of the Boyer-Myrvold algorithm to show the existence of an // "x-y path" connecting some vertex on the "left side" of the x,y,z // bicomp with some vertex on the "right side" of the bicomp (where the - // left and right are split by a line drawn through v and z.If either of - // the endpoints of the x-y path is above x or y on the bicomp, a K_3_3 - // can be isolated - this is a case C. Otherwise, both endpoints are at - // or below x and y on the bicomp. If there is a vertex alpha on the x-y + // left and right are split by a line drawn through v and z.If either of + // the endpoints of the x-y path is above x or y on the bicomp, a K_3_3 + // can be isolated - this is a case C. Otherwise, both endpoints are at + // or below x and y on the bicomp. If there is a vertex alpha on the x-y // path such that alpha is not x or y and there's a path from alpha to v // that's disjoint from any of the edges on the bicomp and the x-y path, // a K_3_3 can be isolated - this is a case D. Otherwise, properties of @@ -1192,8 +1192,8 @@ namespace boost out_edge_iterator_t oei, oei_end; typename std::vector<edge_t>::iterator xi, xi_end; - // Clear the short-circuit edges - these are needed for the planar - // testing/embedding algorithm to run in linear time, but they'll + // Clear the short-circuit edges - these are needed for the planar + // testing/embedding algorithm to run in linear time, but they'll // complicate the kuratowski subgraph isolation for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) { @@ -1217,12 +1217,12 @@ namespace boost typename std::vector<edge_t>::iterator embedded_itr, embedded_end; embedded_end = embedded_edges.end(); - for(embedded_itr = embedded_edges.begin(); + for(embedded_itr = embedded_edges.begin(); embedded_itr != embedded_end; ++embedded_itr ) is_embedded[*embedded_itr] = true; - // upper_face_vertex is true for x,y, and all vertices above x and y in + // upper_face_vertex is true for x,y, and all vertices above x and y in // the bicomp std::vector<bool> upper_face_vertex_vector(num_vertices(g), false); vertex_to_bool_map_t upper_face_vertex @@ -1234,7 +1234,7 @@ namespace boost // These next few variable declarations are all things that we need // to find. - vertex_t z; + vertex_t z; vertex_t bicomp_root; vertex_t w = graph_traits<Graph>::null_vertex(); face_handle_t w_handle; @@ -1256,13 +1256,13 @@ namespace boost //backedge from V, then goes up until it hits either X or Y //(but doesn't find X or Y as the root of a bicomp) - typename face_vertex_iterator<>::type + typename face_vertex_iterator<>::type x_upper_itr(x, face_handles, first_side()); - typename face_vertex_iterator<>::type + typename face_vertex_iterator<>::type x_lower_itr(x, face_handles, second_side()); typename face_vertex_iterator<>::type face_itr, face_end; - // Don't know which path from x is the upper or lower path - + // Don't know which path from x is the upper or lower path - // we'll find out here for(face_itr = x_upper_itr; face_itr != face_end; ++face_itr) { @@ -1284,9 +1284,9 @@ namespace boost upper_face_vertex[current_vertex] = true; } - v_dfchild_handle + v_dfchild_handle = dfs_child_handles[canonical_dfs_child[previous_vertex]]; - + for(face_itr = x_lower_itr; *face_itr != y; ++face_itr) { vertex_t current_vertex(*face_itr); @@ -1297,7 +1297,7 @@ namespace boost if (w == graph_traits<Graph>::null_vertex()) //haven't found a w yet { roots_end = pertinent_roots[current_vertex]->end(); - for(roots_itr = pertinent_roots[current_vertex]->begin(); + for(roots_itr = pertinent_roots[current_vertex]->begin(); roots_itr != roots_end; ++roots_itr ) { @@ -1327,7 +1327,7 @@ namespace boost edge_to_bool_map_t outer_face_edge(outer_face_edge_vector.begin(), em); walkup_itr_t walkup_end; - for(walkup_itr_t walkup_itr(x, face_handles, first_side()); + for(walkup_itr_t walkup_itr(x, face_handles, first_side()); walkup_itr != walkup_end; ++walkup_itr ) { @@ -1335,7 +1335,7 @@ namespace boost is_in_subgraph[*walkup_itr] = true; } - for(walkup_itr_t walkup_itr(x, face_handles, second_side()); + for(walkup_itr_t walkup_itr(x, face_handles, second_side()); walkup_itr != walkup_end; ++walkup_itr ) { @@ -1355,53 +1355,53 @@ namespace boost for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { edge_t e(*ei); - goal_edge[e] + goal_edge[e] = !outer_face_edge[e] && (source(e,g) == x || target(e,g) == x); forbidden_edge[*ei] = outer_face_edge[*ei]; } vertex_t x_ancestor = v; vertex_t x_endpoint = graph_traits<Graph>::null_vertex(); - + while(x_endpoint == graph_traits<Graph>::null_vertex()) - { + { x_ancestor = dfs_parent[x_ancestor]; - x_endpoint = kuratowski_walkup(x_ancestor, - forbidden_edge, + x_endpoint = kuratowski_walkup(x_ancestor, + forbidden_edge, goal_edge, is_embedded, x_external_path ); - - } + + } for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { edge_t e(*ei); - goal_edge[e] + goal_edge[e] = !outer_face_edge[e] && (source(e,g) == y || target(e,g) == y); forbidden_edge[*ei] = outer_face_edge[*ei]; } vertex_t y_ancestor = v; vertex_t y_endpoint = graph_traits<Graph>::null_vertex(); - + while(y_endpoint == graph_traits<Graph>::null_vertex()) - { + { y_ancestor = dfs_parent[y_ancestor]; - y_endpoint = kuratowski_walkup(y_ancestor, - forbidden_edge, + y_endpoint = kuratowski_walkup(y_ancestor, + forbidden_edge, goal_edge, is_embedded, y_external_path ); - - } - + + } + vertex_t parent, child; - + //If v isn't on the same bicomp as x and y, it's a case A if (bicomp_root != v) { @@ -1412,13 +1412,13 @@ namespace boost for(boost::tie(oei,oei_end) = out_edges(*vi,g); oei != oei_end; ++oei) if(!outer_face_edge[*oei]) goal_edge[*oei] = true; - + for(boost::tie(ei,ei_end) = edges(g); ei != ei_end; ++ei) forbidden_edge[*ei] = outer_face_edge[*ei]; - + z = kuratowski_walkup (v, forbidden_edge, goal_edge, is_embedded, z_v_path); - + } else if (w != graph_traits<Graph>::null_vertex()) { @@ -1430,17 +1430,17 @@ namespace boost goal_edge[e] = false; forbidden_edge[e] = outer_face_edge[e]; } - + goal_edge[w_handle.first_edge()] = true; goal_edge[w_handle.second_edge()] = true; z = kuratowski_walkup(v, - forbidden_edge, + forbidden_edge, goal_edge, is_embedded, z_v_path ); - + for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { @@ -1453,41 +1453,41 @@ namespace boost { goal_edge[*pi] = true; } - + w_ancestor = v; vertex_t w_endpoint = graph_traits<Graph>::null_vertex(); - + while(w_endpoint == graph_traits<Graph>::null_vertex()) - { + { w_ancestor = dfs_parent[w_ancestor]; - w_endpoint = kuratowski_walkup(w_ancestor, - forbidden_edge, + w_endpoint = kuratowski_walkup(w_ancestor, + forbidden_edge, goal_edge, is_embedded, w_path ); - - } - - // We really want both the w walkup and the z walkup to finish on - // exactly the same edge, but for convenience (since we don't have - // control over which side of a bicomp a walkup moves up) we've - // defined the walkup to either end at w_handle.first_edge() or - // w_handle.second_edge(). If both walkups ended at different edges, - // we'll do a little surgery on the w walkup path to make it follow + + } + + // We really want both the w walkup and the z walkup to finish on + // exactly the same edge, but for convenience (since we don't have + // control over which side of a bicomp a walkup moves up) we've + // defined the walkup to either end at w_handle.first_edge() or + // w_handle.second_edge(). If both walkups ended at different edges, + // we'll do a little surgery on the w walkup path to make it follow // the other side of the final bicomp. - if ((w_path.back() == w_handle.first_edge() && - z_v_path.back() == w_handle.second_edge()) + if ((w_path.back() == w_handle.first_edge() && + z_v_path.back() == w_handle.second_edge()) || - (w_path.back() == w_handle.second_edge() && + (w_path.back() == w_handle.second_edge() && z_v_path.back() == w_handle.first_edge()) ) { walkup_itr_t wi, wi_end; edge_t final_edge = w_path.back(); - vertex_t anchor - = source(final_edge, g) == w_handle.get_anchor() ? + vertex_t anchor + = source(final_edge, g) == w_handle.get_anchor() ? target(final_edge, g) : source(final_edge, g); if (face_handles[anchor].first_edge() == final_edge) wi = walkup_itr_t(anchor, face_handles, second_side()); @@ -1506,9 +1506,9 @@ namespace boost } } - + } - else + else { //We need to find a valid z, since the x-y path re-defines the lower @@ -1519,7 +1519,7 @@ namespace boost // The z we've used so far is just an externally active vertex on the // lower face path, but may not be the z we need for a case C, D, or - // E subgraph. the z we need now is any externally active vertex on + // E subgraph. the z we need now is any externally active vertex on // the lower face path with both old_face_handles edges on the outer // face. Since we know an x-y path exists, such a z must also exist. @@ -1530,7 +1530,7 @@ namespace boost for(face_itr = x_lower_itr; *face_itr != y; ++face_itr) { vertex_t possible_z(*face_itr); - if (pertinent(possible_z,v) && + if (pertinent(possible_z,v) && outer_face_edge[face_handles[possible_z].old_first_edge()] && outer_face_edge[face_handles[possible_z].old_second_edge()] ) @@ -1544,14 +1544,14 @@ namespace boost if (externally_active(z,v)) w = z; - + typedef typename face_edge_iterator - <single_side, previous_iteration>::type old_face_iterator_t; + <single_side, previous_iteration>::type old_face_iterator_t; - old_face_iterator_t + old_face_iterator_t first_old_face_itr(z, face_handles, first_side()); - old_face_iterator_t + old_face_iterator_t second_old_face_itr(z, face_handles, second_side()); old_face_iterator_t old_face_itr, old_face_end; @@ -1563,10 +1563,10 @@ namespace boost vertex_to_bool_map_t x_y_path_vertex (x_y_path_vertex_vector.begin(), vm); - typename std::vector<old_face_iterator_t>::iterator + typename std::vector<old_face_iterator_t>::iterator of_itr, of_itr_end; - of_itr_end = old_face_iterators.end(); - for(of_itr = old_face_iterators.begin(); + of_itr_end = old_face_iterators.end(); + for(of_itr = old_face_iterators.begin(); of_itr != of_itr_end; ++of_itr ) { @@ -1580,13 +1580,13 @@ namespace boost { edge_t e(*old_face_itr); previous_vertex = current_vertex; - current_vertex = source(e,g) == current_vertex ? + current_vertex = source(e,g) == current_vertex ? target(e,g) : source(e,g); - + if (current_vertex == x || current_vertex == y) seen_x_or_y = true; - if (w == graph_traits<Graph>::null_vertex() && + if (w == graph_traits<Graph>::null_vertex() && externally_active(current_vertex,v) && outer_face_edge[e] && outer_face_edge[*boost::next(old_face_itr)] && @@ -1595,10 +1595,10 @@ namespace boost { w = current_vertex; } - + if (!outer_face_edge[e]) { - if (!upper_face_vertex[current_vertex] && + if (!upper_face_vertex[current_vertex] && !lower_face_vertex[current_vertex] ) { @@ -1606,22 +1606,22 @@ namespace boost } is_in_subgraph[e] = true; - if (upper_face_vertex[source(e,g)] || + if (upper_face_vertex[source(e,g)] || lower_face_vertex[source(e,g)] ) { - if (first_x_y_path_endpoint == + if (first_x_y_path_endpoint == graph_traits<Graph>::null_vertex() ) first_x_y_path_endpoint = source(e,g); else second_x_y_path_endpoint = source(e,g); } - if (upper_face_vertex[target(e,g)] || + if (upper_face_vertex[target(e,g)] || lower_face_vertex[target(e,g)] ) { - if (first_x_y_path_endpoint == + if (first_x_y_path_endpoint == graph_traits<Graph>::null_vertex() ) first_x_y_path_endpoint = target(e,g); @@ -1635,35 +1635,35 @@ namespace boost { chosen_case = detail::BM_CASE_C; } - + } } - // Look for a case D - one of v's embedded edges will connect to the + // Look for a case D - one of v's embedded edges will connect to the // x-y path along an inner face path. //First, get a list of all of v's embedded child edges out_edge_iterator_t v_edge_itr, v_edge_end; - for(boost::tie(v_edge_itr,v_edge_end) = out_edges(v,g); + for(boost::tie(v_edge_itr,v_edge_end) = out_edges(v,g); v_edge_itr != v_edge_end; ++v_edge_itr ) { edge_t embedded_edge(*v_edge_itr); - - if (!is_embedded[embedded_edge] || + + if (!is_embedded[embedded_edge] || embedded_edge == dfs_parent_edge[v] ) continue; case_d_edges.push_back(embedded_edge); - vertex_t current_vertex - = source(embedded_edge,g) == v ? + vertex_t current_vertex + = source(embedded_edge,g) == v ? target(embedded_edge,g) : source(embedded_edge,g); - typename face_edge_iterator<>::type + typename face_edge_iterator<>::type internal_face_itr, internal_face_end; if (face_handles[current_vertex].first_vertex() == v) { @@ -1677,13 +1677,13 @@ namespace boost } while(internal_face_itr != internal_face_end && - !outer_face_edge[*internal_face_itr] && + !outer_face_edge[*internal_face_itr] && !x_y_path_vertex[current_vertex] ) { edge_t e(*internal_face_itr); case_d_edges.push_back(e); - current_vertex = + current_vertex = source(e,g) == current_vertex ? target(e,g) : source(e,g); ++internal_face_itr; } @@ -1699,7 +1699,7 @@ namespace boost } } - + } @@ -1714,25 +1714,25 @@ namespace boost for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { edge_t e(*ei); - goal_edge[e] = !outer_face_edge[e] && + goal_edge[e] = !outer_face_edge[e] && (source(e,g) == z || target(e,g) == z); forbidden_edge[e] = outer_face_edge[e]; } kuratowski_walkup(v, - forbidden_edge, + forbidden_edge, goal_edge, is_embedded, z_v_path ); - + if (chosen_case == detail::BM_CASE_E) { for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { forbidden_edge[*ei] = outer_face_edge[*ei]; - goal_edge[*ei] = !outer_face_edge[*ei] && + goal_edge[*ei] = !outer_face_edge[*ei] && (source(*ei,g) == w || target(*ei,g) == w); } @@ -1748,22 +1748,22 @@ namespace boost { goal_edge[*pi] = true; } - + w_ancestor = v; vertex_t w_endpoint = graph_traits<Graph>::null_vertex(); - + while(w_endpoint == graph_traits<Graph>::null_vertex()) - { + { w_ancestor = dfs_parent[w_ancestor]; - w_endpoint = kuratowski_walkup(w_ancestor, - forbidden_edge, + w_endpoint = kuratowski_walkup(w_ancestor, + forbidden_edge, goal_edge, is_embedded, w_path ); - - } - + + } + } @@ -1794,7 +1794,7 @@ namespace boost xi_end = w_path.end(); for(xi = w_path.begin(); xi != xi_end; ++xi) is_in_subgraph[*xi] = true; - + child = bicomp_root; parent = dfs_parent[child]; while(child != parent) @@ -1806,10 +1806,10 @@ namespace boost - // At this point, we've already isolated the Kuratowski subgraph and - // collected all of the edges that compose it in the is_in_subgraph - // property map. But we want the verification of such a subgraph to be - // a deterministic process, and we can simplify the function + // At this point, we've already isolated the Kuratowski subgraph and + // collected all of the edges that compose it in the is_in_subgraph + // property map. But we want the verification of such a subgraph to be + // a deterministic process, and we can simplify the function // is_kuratowski_subgraph by cleaning up some edges here. if (chosen_case == detail::BM_CASE_B) @@ -1821,13 +1821,13 @@ namespace boost // In a case C subgraph, at least one of the x-y path endpoints // (call it alpha) is above either x or y on the outer face. The // other endpoint may be attached at x or y OR above OR below. In - // any of these three cases, we can form a K_3_3 by removing the - // edge attached to v on the outer face that is NOT on the path to + // any of these three cases, we can form a K_3_3 by removing the + // edge attached to v on the outer face that is NOT on the path to // alpha. - typename face_vertex_iterator<single_side, follow_visitor>::type + typename face_vertex_iterator<single_side, follow_visitor>::type face_itr, face_end; - if (face_handles[v_dfchild_handle.first_vertex()].first_edge() == + if (face_handles[v_dfchild_handle.first_vertex()].first_edge() == v_dfchild_handle.first_edge() ) { @@ -1857,13 +1857,13 @@ namespace boost break; } } - + } else if (chosen_case == detail::BM_CASE_D) { // Need to remove both of the edges adjacent to v on the outer face. // remove the connecting edges from v to bicomp, then - // is_kuratowski_subgraph will shrink vertices of degree 1 + // is_kuratowski_subgraph will shrink vertices of degree 1 // automatically... is_in_subgraph[v_dfchild_handle.first_edge()] = false; @@ -1872,8 +1872,8 @@ namespace boost } else if (chosen_case == detail::BM_CASE_E) { - // Similarly to case C, if the endpoints of the x-y path are both - // below x and y, we should remove an edge to allow the subgraph to + // Similarly to case C, if the endpoints of the x-y path are both + // below x and y, we should remove an edge to allow the subgraph to // contract to a K_3_3. @@ -1881,7 +1881,7 @@ namespace boost (second_x_y_path_endpoint != x && second_x_y_path_endpoint != y) ) { - is_in_subgraph[dfs_parent_edge[v]] = false; + is_in_subgraph[dfs_parent_edge[v]] = false; vertex_t deletion_endpoint, other_endpoint; if (lower_face_vertex[first_x_y_path_endpoint]) @@ -1890,13 +1890,13 @@ namespace boost other_endpoint = first_x_y_path_endpoint; } else - { + { deletion_endpoint = first_x_y_path_endpoint; other_endpoint = second_x_y_path_endpoint; } typename face_edge_iterator<>::type face_itr, face_end; - + bool found_other_endpoint = false; for(face_itr = typename face_edge_iterator<>::type (deletion_endpoint, face_handles, first_side()); @@ -1904,7 +1904,7 @@ namespace boost ) { edge_t e(*face_itr); - if (source(e,g) == other_endpoint || + if (source(e,g) == other_endpoint || target(e,g) == other_endpoint ) { @@ -1915,7 +1915,7 @@ namespace boost if (found_other_endpoint) { - is_in_subgraph[face_handles[deletion_endpoint].first_edge()] + is_in_subgraph[face_handles[deletion_endpoint].first_edge()] = false; } else @@ -1924,14 +1924,14 @@ namespace boost = false; } } - + } for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) if (is_in_subgraph[*ei]) *o_itr = *ei; - + } @@ -1957,14 +1957,14 @@ namespace boost vertex_t kuratowski_v; vertex_t kuratowski_x; vertex_t kuratowski_y; - - vertex_list_t garbage; // we delete items from linked lists by + + vertex_list_t garbage; // we delete items from linked lists by // splicing them into garbage //only need these two for kuratowski subgraph isolation std::vector<vertex_t> current_merge_points; std::vector<edge_t> embedded_edges; - + //property map storage std::vector<v_size_t> low_point_vector; std::vector<vertex_t> dfs_parent_vector; @@ -1976,7 +1976,7 @@ namespace boost std::vector< face_handle_t > face_handles_vector; std::vector< face_handle_t > dfs_child_handles_vector; std::vector< vertex_list_ptr_t > separated_dfs_child_list_vector; - std::vector< typename vertex_list_t::iterator > + std::vector< typename vertex_list_t::iterator > separated_node_in_parent_list_vector; std::vector<vertex_t> canonical_dfs_child_vector; std::vector<bool> flipped_vector; @@ -1993,20 +1993,20 @@ namespace boost vertex_to_face_handle_list_ptr_map_t pertinent_roots; vertex_to_v_size_map_t backedge_flag; vertex_to_v_size_map_t visited; - vertex_to_face_handle_map_t face_handles; + vertex_to_face_handle_map_t face_handles; vertex_to_face_handle_map_t dfs_child_handles; vertex_to_vertex_list_ptr_map_t separated_dfs_child_list; vertex_to_separated_node_map_t separated_node_in_parent_list; - vertex_to_vertex_map_t canonical_dfs_child; + vertex_to_vertex_map_t canonical_dfs_child; vertex_to_bool_map_t flipped; vertex_to_edge_vector_map_t backedges; vertex_to_edge_map_t dfs_parent_edge; //only need for kuratowski merge_stack_t merge_stack; - + }; - - + + } //namespace boost #endif //__BOYER_MYRVOLD_IMPL_HPP__ diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/planar_detail/face_handles.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/planar_detail/face_handles.hpp index 99b4eec3..4e28d4af 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/planar_detail/face_handles.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/planar_detail/face_handles.hpp @@ -12,7 +12,7 @@ #include <list> #include <boost/graph/graph_traits.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> // A "face handle" is an optimization meant to serve two purposes in @@ -26,7 +26,7 @@ // sequence of edges. The functions first_vertex/second_vertex and // first_edge/second_edge allow fast access to the beginning and end of the // stored sequence, which allows one to traverse the outer face of the partial -// planar embedding as it's being created. +// planar embedding as it's being created. // // There are some policies below that define the contents of the face handles: // in the case no embedding is needed (for example, if one just wants to use @@ -48,7 +48,7 @@ namespace boost { namespace graph { namespace detail { //face handle policies - + //EmbeddingStorage policy struct store_embedding {}; struct recursive_lazy_list : public store_embedding {}; @@ -65,14 +65,14 @@ namespace boost { namespace graph { namespace detail { template<typename DataType> struct lazy_list_node { - typedef std::shared_ptr< lazy_list_node<DataType> > ptr_t; + typedef shared_ptr< lazy_list_node<DataType> > ptr_t; lazy_list_node(const DataType& data) : m_reversed(false), m_data(data), m_has_data(true) {} - + lazy_list_node(ptr_t left_child, ptr_t right_child) : m_reversed(false), m_has_data(false), @@ -83,10 +83,10 @@ namespace boost { namespace graph { namespace detail { bool m_reversed; DataType m_data; bool m_has_data; - std::shared_ptr<lazy_list_node> m_left_child; - std::shared_ptr<lazy_list_node> m_right_child; + shared_ptr<lazy_list_node> m_left_child; + shared_ptr<lazy_list_node> m_right_child; }; - + template <typename StoreOldHandlesPolicy, typename Vertex, typename Edge> @@ -139,7 +139,7 @@ namespace boost { namespace graph { namespace detail { struct edge_list_storage<recursive_lazy_list, Edge> { typedef lazy_list_node<Edge> node_type; - typedef std::shared_ptr< node_type > type; + typedef shared_ptr< node_type > type; type value; void push_back(Edge e) @@ -178,17 +178,17 @@ namespace boost { namespace graph { namespace detail { private: template <typename OutputIterator> - void get_list_helper(OutputIterator o_itr, + void get_list_helper(OutputIterator o_itr, type root, bool flipped = false ) { if (!root) return; - + if (root->m_has_data) *o_itr = root->m_data; - + if ((flipped && !root->m_reversed) || (!flipped && root->m_reversed) ) @@ -201,9 +201,9 @@ namespace boost { namespace graph { namespace detail { get_list_helper(o_itr, root->m_left_child, false); get_list_helper(o_itr, root->m_right_child, false); } - + } - + }; @@ -254,20 +254,20 @@ namespace boost { namespace graph { namespace detail { - - template<typename Graph, - typename StoreOldHandlesPolicy, - typename StoreEmbeddingPolicy + + template<typename Graph, + typename StoreOldHandlesPolicy, + typename StoreEmbeddingPolicy > struct face_handle_impl { typedef typename graph_traits<Graph>::vertex_descriptor vertex_t; typedef typename graph_traits<Graph>::edge_descriptor edge_t; - typedef typename edge_list_storage<StoreEmbeddingPolicy, edge_t>::type + typedef typename edge_list_storage<StoreEmbeddingPolicy, edge_t>::type edge_list_storage_t; - face_handle_impl() : + face_handle_impl() : cached_first_vertex(graph_traits<Graph>::null_vertex()), cached_second_vertex(graph_traits<Graph>::null_vertex()), true_first_vertex(graph_traits<Graph>::null_vertex()), @@ -308,11 +308,11 @@ namespace boost { namespace graph { namespace detail { - template <typename Graph, - typename StoreOldHandlesPolicy = store_old_handles, + template <typename Graph, + typename StoreOldHandlesPolicy = store_old_handles, typename StoreEmbeddingPolicy = recursive_lazy_list > - class face_handle + class face_handle { public: typedef typename graph_traits<Graph>::vertex_descriptor vertex_t; @@ -347,19 +347,19 @@ namespace boost { namespace graph { namespace detail { } //default copy construction, assignment okay. - - void push_first(edge_t e, const Graph& g) - { + + void push_first(edge_t e, const Graph& g) + { pimpl->edge_list.push_front(e); - pimpl->cached_first_vertex = pimpl->true_first_vertex = + pimpl->cached_first_vertex = pimpl->true_first_vertex = source(e, g) == pimpl->anchor ? target(e,g) : source(e,g); pimpl->cached_first_edge = e; } - - void push_second(edge_t e, const Graph& g) - { + + void push_second(edge_t e, const Graph& g) + { pimpl->edge_list.push_back(e); - pimpl->cached_second_vertex = pimpl->true_second_vertex = + pimpl->cached_second_vertex = pimpl->true_second_vertex = source(e, g) == pimpl->anchor ? target(e,g) : source(e,g); pimpl->cached_second_edge = e; } @@ -370,22 +370,22 @@ namespace boost { namespace graph { namespace detail { } inline vertex_t first_vertex() const - { + { return pimpl->cached_first_vertex; } - - inline vertex_t second_vertex() const - { + + inline vertex_t second_vertex() const + { return pimpl->cached_second_vertex; } - inline vertex_t true_first_vertex() const - { + inline vertex_t true_first_vertex() const + { return pimpl->true_first_vertex; } - inline vertex_t true_second_vertex() const - { + inline vertex_t true_second_vertex() const + { return pimpl->true_second_vertex; } @@ -413,17 +413,17 @@ namespace boost { namespace graph { namespace detail { { return pimpl->cached_first_edge; } - + inline edge_t second_edge() const { return pimpl->cached_second_edge; } - + inline vertex_t get_anchor() const { return pimpl->anchor; } - + void glue_first_to_second (face_handle<Graph,StoreOldHandlesPolicy,StoreEmbeddingPolicy>& bottom) { @@ -432,7 +432,7 @@ namespace boost { namespace graph { namespace detail { pimpl->cached_first_vertex = bottom.pimpl->cached_first_vertex; pimpl->cached_first_edge = bottom.pimpl->cached_first_edge; } - + void glue_second_to_first (face_handle<Graph,StoreOldHandlesPolicy,StoreEmbeddingPolicy>& bottom) { @@ -441,7 +441,7 @@ namespace boost { namespace graph { namespace detail { pimpl->cached_second_vertex = bottom.pimpl->cached_second_vertex; pimpl->cached_second_edge = bottom.pimpl->cached_second_edge; } - + void flip() { pimpl->edge_list.reverse(); @@ -449,7 +449,7 @@ namespace boost { namespace graph { namespace detail { std::swap(pimpl->cached_first_vertex, pimpl->cached_second_vertex); std::swap(pimpl->cached_first_edge, pimpl->cached_second_edge); } - + template <typename OutputIterator> void get_list(OutputIterator o_itr) { @@ -481,12 +481,12 @@ namespace boost { namespace graph { namespace detail { pimpl->old_handles.first_edge = pimpl->cached_first_edge; pimpl->old_handles.second_edge = pimpl->cached_second_edge; } - + void store_old_face_handles_dispatch(no_old_handles) {} - boost::std::shared_ptr<impl_t> pimpl; + boost::shared_ptr<impl_t> pimpl; }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/plod_generator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/plod_generator.hpp index d0684d88..4e557cf0 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/plod_generator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/plod_generator.hpp @@ -12,7 +12,7 @@ #include <iterator> #include <utility> #include <boost/random/uniform_int.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/graph/graph_traits.hpp> #include <vector> #include <map> @@ -21,7 +21,7 @@ namespace boost { template<typename RandomGenerator> - class out_directed_plod_iterator + class out_directed_plod_iterator { public: typedef std::forward_iterator_tag iterator_category; @@ -32,10 +32,10 @@ namespace boost { out_directed_plod_iterator() : gen(0), at_end(true) { } - out_directed_plod_iterator(RandomGenerator& gen, std::size_t n, - double alpha, double beta, + out_directed_plod_iterator(RandomGenerator& gen, std::size_t n, + double alpha, double beta, bool allow_self_loops) - : gen(&gen), n(n), alpha(alpha), beta(beta), + : gen(&gen), n(n), alpha(alpha), beta(beta), allow_self_loops(allow_self_loops), at_end(false), degree(0), current(0, 0) { @@ -50,7 +50,7 @@ namespace boost { pointer operator->() const { return ¤t; } out_directed_plod_iterator& operator++() - { + { using std::pow; uniform_int<std::size_t> x(0, n-1); @@ -66,7 +66,7 @@ namespace boost { } std::size_t xv = x(*gen); - degree = (xv == 0? 0 : std::size_t(beta * pow(xv, -alpha))); + degree = (xv == 0? 0 : std::size_t(beta * pow(xv, -alpha))); } do { @@ -85,16 +85,16 @@ namespace boost { } bool operator==(const out_directed_plod_iterator& other) const - { - return at_end == other.at_end; + { + return at_end == other.at_end; } bool operator!=(const out_directed_plod_iterator& other) const - { - return !(*this == other); + { + return !(*this == other); } - private: + private: RandomGenerator* gen; std::size_t n; double alpha; @@ -106,7 +106,7 @@ namespace boost { }; template<typename RandomGenerator> - class undirected_plod_iterator + class undirected_plod_iterator { typedef std::vector<std::pair<std::size_t, std::size_t> > out_degrees_t; @@ -117,11 +117,11 @@ namespace boost { typedef const value_type* pointer; typedef std::ptrdiff_t difference_type; - undirected_plod_iterator() + undirected_plod_iterator() : gen(0), out_degrees(), degrees_left(0), allow_self_loops(false) { } - undirected_plod_iterator(RandomGenerator& gen, std::size_t n, - double alpha, double beta, + undirected_plod_iterator(RandomGenerator& gen, std::size_t n, + double alpha, double beta, bool allow_self_loops = false) : gen(&gen), n(n), out_degrees(new out_degrees_t), degrees_left(0), allow_self_loops(allow_self_loops) @@ -145,7 +145,7 @@ namespace boost { pointer operator->() const { return ¤t; } undirected_plod_iterator& operator++() - { + { next(); return *this; } @@ -158,8 +158,8 @@ namespace boost { } bool operator==(const undirected_plod_iterator& other) const - { - return degrees_left == other.degrees_left; + { + return degrees_left == other.degrees_left; } bool operator!=(const undirected_plod_iterator& other) const @@ -192,7 +192,7 @@ namespace boost { (*out_degrees)[source] = out_degrees->back(); out_degrees->pop_back(); continue; - } + } // Select target vertex target = x(*gen); @@ -200,7 +200,7 @@ namespace boost { (*out_degrees)[target] = out_degrees->back(); out_degrees->pop_back(); continue; - } else if (source != target + } else if (source != target || (allow_self_loops && (*out_degrees)[source].second > 2)) { break; } @@ -217,7 +217,7 @@ namespace boost { RandomGenerator* gen; std::size_t n; - std::shared_ptr<out_degrees_t> out_degrees; + shared_ptr<out_degrees_t> out_degrees; std::size_t degrees_left; bool allow_self_loops; value_type current; @@ -243,7 +243,7 @@ namespace boost { public: plod_iterator() : inherited() { } - plod_iterator(RandomGenerator& gen, std::size_t n, + plod_iterator(RandomGenerator& gen, std::size_t n, double alpha, double beta, bool allow_self_loops = false) : inherited(gen, n, alpha, beta, allow_self_loops) { } }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/rmat_graph_generator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/rmat_graph_generator.hpp index f51e9e27..4256d7a8 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/rmat_graph_generator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/rmat_graph_generator.hpp @@ -15,7 +15,7 @@ #include <vector> #include <queue> #include <map> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/assert.hpp> #include <boost/random/uniform_int.hpp> #include <boost/random/uniform_01.hpp> @@ -24,7 +24,7 @@ #include <boost/type_traits/is_same.hpp> #include <boost/test/floating_point_comparison.hpp> -using boost::std::shared_ptr; +using boost::shared_ptr; using boost::uniform_01; // Returns floor(log_2(n)), and -1 when n is 0 @@ -76,7 +76,7 @@ generate_permutation_vector(RandomGenerator& gen, std::vector<T>& vertexPermutat template <typename RandomGenerator, typename T> std::pair<T,T> -generate_edge(std::shared_ptr<uniform_01<RandomGenerator> > prob, T n, +generate_edge(shared_ptr<uniform_01<RandomGenerator> > prob, T n, unsigned int SCALE, double a, double b, double c, double d) { T u = 0, v = 0; @@ -213,7 +213,7 @@ namespace boost { private: // Parameters - std::shared_ptr<uniform_01<RandomGenerator> > gen; + shared_ptr<uniform_01<RandomGenerator> > gen; vertices_size_type n; double a, b, c, d; int edge; @@ -328,7 +328,7 @@ namespace boost { private: // Parameters - std::shared_ptr<uniform_01<RandomGenerator> > gen; + shared_ptr<uniform_01<RandomGenerator> > gen; bool permute_vertices; // Internal data structures @@ -442,7 +442,7 @@ namespace boost { private: // Parameters - std::shared_ptr<uniform_01<RandomGenerator> > gen; + shared_ptr<uniform_01<RandomGenerator> > gen; // Internal data structures std::vector<value_type> values; @@ -576,7 +576,7 @@ namespace boost { private: // Parameters - std::shared_ptr<uniform_01<RandomGenerator> > gen; + shared_ptr<uniform_01<RandomGenerator> > gen; bool bidirectional; // Internal data structures diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/topology.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/topology.hpp index 8e64d090..ada36d19 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/topology.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/graph/topology.hpp @@ -29,10 +29,10 @@ namespace boost { * Topologies * ***********************************************************/ template<std::size_t Dims> -class convex_topology +class convex_topology { public: // For VisualAge C++ - struct point + struct point { BOOST_STATIC_CONSTANT(std::size_t, dimensions = Dims); point() { } @@ -129,7 +129,7 @@ class convex_topology typedef point point_type; typedef point_difference point_difference_type; - double distance(point a, point b) const + double distance(point a, point b) const { double dist = 0.; for (std::size_t i = 0; i < Dims; ++i) { @@ -142,7 +142,7 @@ class convex_topology return dist; } - point move_position_toward(point a, double fraction, point b) const + point move_position_toward(point a, double fraction, point b) const { point result; for (std::size_t i = 0; i < Dims; ++i) @@ -206,15 +206,15 @@ class hypercube_topology : public convex_topology<Dims> typedef typename convex_topology<Dims>::point_type point_type; typedef typename convex_topology<Dims>::point_difference_type point_difference_type; - explicit hypercube_topology(double scaling = 1.0) - : gen_ptr(new RandomNumberGenerator), rand(new rand_t(*gen_ptr)), - scaling(scaling) + explicit hypercube_topology(double scaling = 1.0) + : gen_ptr(new RandomNumberGenerator), rand(new rand_t(*gen_ptr)), + scaling(scaling) { } - hypercube_topology(RandomNumberGenerator& gen, double scaling = 1.0) + hypercube_topology(RandomNumberGenerator& gen, double scaling = 1.0) : gen_ptr(), rand(new rand_t(gen)), scaling(scaling) { } - - point_type random_point() const + + point_type random_point() const { point_type p; for (std::size_t i = 0; i < Dims; ++i) @@ -268,8 +268,8 @@ class hypercube_topology : public convex_topology<Dims> } private: - std::shared_ptr<RandomNumberGenerator> gen_ptr; - std::shared_ptr<rand_t> rand; + shared_ptr<RandomNumberGenerator> gen_ptr; + shared_ptr<rand_t> rand; double scaling; }; @@ -280,8 +280,8 @@ class square_topology : public hypercube_topology<2, RandomNumberGenerator> public: explicit square_topology(double scaling = 1.0) : inherited(scaling) { } - - square_topology(RandomNumberGenerator& gen, double scaling = 1.0) + + square_topology(RandomNumberGenerator& gen, double scaling = 1.0) : inherited(gen, scaling) { } }; @@ -308,7 +308,7 @@ class rectangle_topology : public convex_topology<2> typedef typename convex_topology<2>::point_type point_type; typedef typename convex_topology<2>::point_difference_type point_difference_type; - point_type random_point() const + point_type random_point() const { point_type p; p[0] = (*rand)() * (right - left) + left; @@ -362,8 +362,8 @@ class rectangle_topology : public convex_topology<2> } private: - std::shared_ptr<RandomNumberGenerator> gen_ptr; - std::shared_ptr<rand_t> rand; + shared_ptr<RandomNumberGenerator> gen_ptr; + shared_ptr<rand_t> rand; double left, top, right, bottom; }; @@ -374,8 +374,8 @@ class cube_topology : public hypercube_topology<3, RandomNumberGenerator> public: explicit cube_topology(double scaling = 1.0) : inherited(scaling) { } - - cube_topology(RandomNumberGenerator& gen, double scaling = 1.0) + + cube_topology(RandomNumberGenerator& gen, double scaling = 1.0) : inherited(gen, scaling) { } }; @@ -389,15 +389,15 @@ class ball_topology : public convex_topology<Dims> typedef typename convex_topology<Dims>::point_type point_type; typedef typename convex_topology<Dims>::point_difference_type point_difference_type; - explicit ball_topology(double radius = 1.0) - : gen_ptr(new RandomNumberGenerator), rand(new rand_t(*gen_ptr)), - radius(radius) + explicit ball_topology(double radius = 1.0) + : gen_ptr(new RandomNumberGenerator), rand(new rand_t(*gen_ptr)), + radius(radius) { } - ball_topology(RandomNumberGenerator& gen, double radius = 1.0) + ball_topology(RandomNumberGenerator& gen, double radius = 1.0) : gen_ptr(), rand(new rand_t(gen)), radius(radius) { } - - point_type random_point() const + + point_type random_point() const { point_type p; double dist_sum; @@ -457,8 +457,8 @@ class ball_topology : public convex_topology<Dims> } private: - std::shared_ptr<RandomNumberGenerator> gen_ptr; - std::shared_ptr<rand_t> rand; + shared_ptr<RandomNumberGenerator> gen_ptr; + shared_ptr<rand_t> rand; double radius; }; @@ -469,8 +469,8 @@ class circle_topology : public ball_topology<2, RandomNumberGenerator> public: explicit circle_topology(double radius = 1.0) : inherited(radius) { } - - circle_topology(RandomNumberGenerator& gen, double radius = 1.0) + + circle_topology(RandomNumberGenerator& gen, double radius = 1.0) : inherited(gen, radius) { } }; @@ -481,13 +481,13 @@ class sphere_topology : public ball_topology<3, RandomNumberGenerator> public: explicit sphere_topology(double radius = 1.0) : inherited(radius) { } - - sphere_topology(RandomNumberGenerator& gen, double radius = 1.0) + + sphere_topology(RandomNumberGenerator& gen, double radius = 1.0) : inherited(gen, radius) { } }; template<typename RandomNumberGenerator = minstd_rand> -class heart_topology +class heart_topology { // Heart is defined as the union of three shapes: // Square w/ corners (+-1000, -1000), (0, 0), (0, -2000) @@ -495,7 +495,7 @@ class heart_topology // Circle centered at (500, -500) radius 500*sqrt(2) // Bounding box (-1000, -2000) - (1000, 500*(sqrt(2) - 1)) - struct point + struct point { point() { values[0] = 0.0; values[1] = 0.0; } point(double x, double y) { values[0] = x; values[1] = y; } @@ -507,7 +507,7 @@ class heart_topology double values[2]; }; - bool in_heart(point p) const + bool in_heart(point p) const { #ifndef BOOST_NO_STDC_NAMESPACE using std::abs; @@ -522,7 +522,7 @@ class heart_topology return false; } - bool segment_within_heart(point p1, point p2) const + bool segment_within_heart(point p1, point p2) const { // Assumes that p1 and p2 are within the heart if ((p1[0] < 0) == (p2[0] < 0)) return true; // Same side of symmetry line @@ -538,13 +538,13 @@ class heart_topology public: typedef point point_type; - heart_topology() + heart_topology() : gen_ptr(new RandomNumberGenerator), rand(new rand_t(*gen_ptr)) { } - heart_topology(RandomNumberGenerator& gen) + heart_topology(RandomNumberGenerator& gen) : gen_ptr(), rand(new rand_t(gen)) { } - point random_point() const + point random_point() const { point result; do { @@ -556,7 +556,7 @@ class heart_topology // Not going to provide clipping to bounding region or distance from boundary - double distance(point a, point b) const + double distance(point a, point b) const { if (segment_within_heart(a, b)) { // Straight line @@ -567,7 +567,7 @@ class heart_topology } } - point move_position_toward(point a, double fraction, point b) const + point move_position_toward(point a, double fraction, point b) const { if (segment_within_heart(a, b)) { // Straight line @@ -576,10 +576,10 @@ class heart_topology } else { double distance_to_point_a = boost::math::hypot(a[0], a[1]); double distance_to_point_b = boost::math::hypot(b[0], b[1]); - double location_of_point = distance_to_point_a / + double location_of_point = distance_to_point_a / (distance_to_point_a + distance_to_point_b); if (fraction < location_of_point) - return point(a[0] * (1 - fraction / location_of_point), + return point(a[0] * (1 - fraction / location_of_point), a[1] * (1 - fraction / location_of_point)); else return point( @@ -589,8 +589,8 @@ class heart_topology } private: - std::shared_ptr<RandomNumberGenerator> gen_ptr; - std::shared_ptr<rand_t> rand; + shared_ptr<RandomNumberGenerator> gen_ptr; + shared_ptr<rand_t> rand; }; } // namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/interprocess_fwd.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/interprocess_fwd.hpp index 0309d6b6..42f170a6 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/interprocess_fwd.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/interprocess_fwd.hpp @@ -393,7 +393,7 @@ template<class T, class VoidPointer> class intrusive_ptr; template<class T, class VoidAllocator, class Deleter> -class std::shared_ptr; +class shared_ptr; template<class T, class VoidAllocator, class Deleter> class weak_ptr; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/smart_ptr/enable_shared_from_this.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/smart_ptr/enable_shared_from_this.hpp index 98c48c5d..d9f16aec 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/smart_ptr/enable_shared_from_this.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/smart_ptr/enable_shared_from_this.hpp @@ -19,7 +19,7 @@ #include <boost/assert.hpp> #include <boost/interprocess/smart_ptr/weak_ptr.hpp> -#include <boost/interprocess/smart_ptr/std::shared_ptr.hpp> +#include <boost/interprocess/smart_ptr/shared_ptr.hpp> //!\file //!Describes an utility to form a shared pointer from this @@ -27,10 +27,10 @@ namespace boost{ namespace interprocess{ -//!This class is used as a base class that allows a std::shared_ptr to the current +//!This class is used as a base class that allows a shared_ptr to the current //!object to be obtained from within a member function. //!enable_shared_from_this defines two member functions called shared_from_this -//!that return a std::shared_ptr<T> and std::shared_ptr<T const>, depending on constness, to this. +//!that return a shared_ptr<T> and shared_ptr<T const>, depending on constness, to this. template<class T, class A, class D> class enable_shared_from_this { @@ -50,16 +50,16 @@ class enable_shared_from_this /// @endcond public: - std::shared_ptr<T, A, D> shared_from_this() + shared_ptr<T, A, D> shared_from_this() { - std::shared_ptr<T, A, D> p(_internal_weak_this); + shared_ptr<T, A, D> p(_internal_weak_this); BOOST_ASSERT(ipcdetail::to_raw_pointer(p.get()) == this); return p; } - std::shared_ptr<T const, A, D> shared_from_this() const + shared_ptr<T const, A, D> shared_from_this() const { - std::shared_ptr<T const, A, D> p(_internal_weak_this); + shared_ptr<T const, A, D> p(_internal_weak_this); BOOST_ASSERT(ipcdetail::to_raw_pointer(p.get()) == this); return p; } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/smart_ptr/shared_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/smart_ptr/shared_ptr.hpp index 29844a97..302eb149 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/smart_ptr/shared_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/smart_ptr/shared_ptr.hpp @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////////// // -// This file is the adaptation for Interprocess of boost/std::shared_ptr.hpp +// This file is the adaptation for Interprocess of boost/shared_ptr.hpp // // (C) Copyright Greg Colvin and Beman Dawes 1998, 1999. // (C) Copyright Peter Dimov 2001, 2002, 2003 @@ -37,7 +37,7 @@ #include <iosfwd> // for std::basic_ostream //!\file -//!Describes the smart pointer std::shared_ptr +//!Describes the smart pointer shared_ptr namespace boost{ namespace interprocess{ @@ -66,11 +66,11 @@ inline void sp_enable_shared_from_this(shared_count<T, VoidAllocator, Deleter> c } // namespace ipcdetail -//!std::shared_ptr stores a pointer to a dynamically allocated object. -//!The object pointed to is guaranteed to be deleted when the last std::shared_ptr pointing to +//!shared_ptr stores a pointer to a dynamically allocated object. +//!The object pointed to is guaranteed to be deleted when the last shared_ptr pointing to //!it is destroyed or reset. //! -//!std::shared_ptr is parameterized on +//!shared_ptr is parameterized on //!T (the type of the object pointed to), VoidAllocator (the void allocator to be used //!to allocate the auxiliary data) and Deleter (the deleter whose //!operator() will be used to delete the object. @@ -79,18 +79,18 @@ inline void sp_enable_shared_from_this(shared_count<T, VoidAllocator, Deleter> c //!VoidAllocator::pointer type (that is, if typename VoidAllocator::pointer is //!offset_ptr<void>, the internal pointer will be offset_ptr<T>). //! -//!Because the implementation uses reference counting, cycles of std::shared_ptr +//!Because the implementation uses reference counting, cycles of shared_ptr //!instances will not be reclaimed. For example, if main() holds a -//!std::shared_ptr to A, which directly or indirectly holds a std::shared_ptr back -//!to A, A's use count will be 2. Destruction of the original std::shared_ptr +//!shared_ptr to A, which directly or indirectly holds a shared_ptr back +//!to A, A's use count will be 2. Destruction of the original shared_ptr //!will leave A dangling with a use count of 1. //!Use weak_ptr to "break cycles." template<class T, class VoidAllocator, class Deleter> -class std::shared_ptr +class shared_ptr { /// @cond private: - typedef std::shared_ptr<T, VoidAllocator, Deleter> this_type; + typedef shared_ptr<T, VoidAllocator, Deleter> this_type; /// @endcond public: @@ -111,19 +111,19 @@ class std::shared_ptr pointer_traits<typename VoidAllocator::pointer>::template rebind_pointer<const VoidAllocator>::type const_allocator_pointer; - BOOST_COPYABLE_AND_MOVABLE(std::shared_ptr) + BOOST_COPYABLE_AND_MOVABLE(shared_ptr) public: - //!Constructs an empty std::shared_ptr. + //!Constructs an empty shared_ptr. //!Use_count() == 0 && get()== 0. - std::shared_ptr() + shared_ptr() : m_pn() // never throws {} - //!Constructs a std::shared_ptr that owns the pointer p. Auxiliary data will be allocated + //!Constructs a shared_ptr that owns the pointer p. Auxiliary data will be allocated //!with a copy of a and the object will be deleted with a copy of d. //!Requirements: Deleter and A's copy constructor must not throw. - explicit std::shared_ptr(const pointer&p, const VoidAllocator &a = VoidAllocator(), const Deleter &d = Deleter()) + explicit shared_ptr(const pointer&p, const VoidAllocator &a = VoidAllocator(), const Deleter &d = Deleter()) : m_pn(p, a, d) { //Check that the pointer passed is of the same type that @@ -137,55 +137,55 @@ class std::shared_ptr ipcdetail::sp_enable_shared_from_this<T, VoidAllocator, Deleter>( m_pn, ipcdetail::to_raw_pointer(p), ipcdetail::to_raw_pointer(p) ); } - //!Copy constructs a std::shared_ptr. If r is empty, constructs an empty std::shared_ptr. Otherwise, constructs - //!a std::shared_ptr that shares ownership with r. Never throws. - std::shared_ptr(const std::shared_ptr &r) + //!Copy constructs a shared_ptr. If r is empty, constructs an empty shared_ptr. Otherwise, constructs + //!a shared_ptr that shares ownership with r. Never throws. + shared_ptr(const shared_ptr &r) : m_pn(r.m_pn) // never throws {} - //!Constructs a std::shared_ptr that shares ownership with other and stores p. + //!Constructs a shared_ptr that shares ownership with other and stores p. //!Postconditions: get() == p && use_count() == r.use_count(). //!Throws: nothing. - std::shared_ptr(const std::shared_ptr &other, const pointer &p) + shared_ptr(const shared_ptr &other, const pointer &p) : m_pn(other.m_pn, p) {} - //!If r is empty, constructs an empty std::shared_ptr. Otherwise, constructs - //!a std::shared_ptr that shares ownership with r. Never throws. + //!If r is empty, constructs an empty shared_ptr. Otherwise, constructs + //!a shared_ptr that shares ownership with r. Never throws. template<class Y> - std::shared_ptr(std::shared_ptr<Y, VoidAllocator, Deleter> const & r) + shared_ptr(shared_ptr<Y, VoidAllocator, Deleter> const & r) : m_pn(r.m_pn) // never throws {} - //!Constructs a std::shared_ptr that shares ownership with r and stores + //!Constructs a shared_ptr that shares ownership with r and stores //!a copy of the pointer stored in r. template<class Y> - explicit std::shared_ptr(weak_ptr<Y, VoidAllocator, Deleter> const & r) + explicit shared_ptr(weak_ptr<Y, VoidAllocator, Deleter> const & r) : m_pn(r.m_pn) // may throw {} - //!Move-Constructs a std::shared_ptr that takes ownership of other resource and + //!Move-Constructs a shared_ptr that takes ownership of other resource and //!other is put in default-constructed state. //!Throws: nothing. - explicit std::shared_ptr(BOOST_RV_REF(std::shared_ptr) other) + explicit shared_ptr(BOOST_RV_REF(shared_ptr) other) : m_pn() { this->swap(other); } /// @cond template<class Y> - std::shared_ptr(std::shared_ptr<Y, VoidAllocator, Deleter> const & r, ipcdetail::static_cast_tag) + shared_ptr(shared_ptr<Y, VoidAllocator, Deleter> const & r, ipcdetail::static_cast_tag) : m_pn( pointer(static_cast<T*>(ipcdetail::to_raw_pointer(r.m_pn.to_raw_pointer()))) , r.m_pn) {} template<class Y> - std::shared_ptr(std::shared_ptr<Y, VoidAllocator, Deleter> const & r, ipcdetail::const_cast_tag) + shared_ptr(shared_ptr<Y, VoidAllocator, Deleter> const & r, ipcdetail::const_cast_tag) : m_pn( pointer(const_cast<T*>(ipcdetail::to_raw_pointer(r.m_pn.to_raw_pointer()))) , r.m_pn) {} template<class Y> - std::shared_ptr(std::shared_ptr<Y, VoidAllocator, Deleter> const & r, ipcdetail::dynamic_cast_tag) + shared_ptr(shared_ptr<Y, VoidAllocator, Deleter> const & r, ipcdetail::dynamic_cast_tag) : m_pn( pointer(dynamic_cast<T*>(ipcdetail::to_raw_pointer(r.m_pn.to_raw_pointer()))) , r.m_pn) { @@ -195,26 +195,26 @@ class std::shared_ptr } /// @endcond - //!Equivalent to std::shared_ptr(r).swap(*this). + //!Equivalent to shared_ptr(r).swap(*this). //!Never throws template<class Y> - std::shared_ptr & operator=(std::shared_ptr<Y, VoidAllocator, Deleter> const & r) + shared_ptr & operator=(shared_ptr<Y, VoidAllocator, Deleter> const & r) { m_pn = r.m_pn; // shared_count::op= doesn't throw return *this; } - //!Equivalent to std::shared_ptr(r).swap(*this). + //!Equivalent to shared_ptr(r).swap(*this). //!Never throws - std::shared_ptr & operator=(BOOST_COPY_ASSIGN_REF(std::shared_ptr) r) + shared_ptr & operator=(BOOST_COPY_ASSIGN_REF(shared_ptr) r) { m_pn = r.m_pn; // shared_count::op= doesn't throw return *this; } - //!Move-assignment. Equivalent to std::shared_ptr(other).swap(*this). + //!Move-assignment. Equivalent to shared_ptr(other).swap(*this). //!Never throws - std::shared_ptr & operator=(BOOST_RV_REF(std::shared_ptr) other) // never throws + shared_ptr & operator=(BOOST_RV_REF(shared_ptr) other) // never throws { this_type(other).swap(*this); return *this; @@ -243,7 +243,7 @@ class std::shared_ptr } template<class Y> - void reset(std::shared_ptr<Y, VoidAllocator, Deleter> const & r, const pointer &p) + void reset(shared_ptr<Y, VoidAllocator, Deleter> const & r, const pointer &p) { this_type(r, p).swap(*this); } @@ -282,7 +282,7 @@ class std::shared_ptr bool unique() const // never throws { return m_pn.unique(); } - //!Returns the number of std::shared_ptr objects, *this included, + //!Returns the number of shared_ptr objects, *this included, //!that share ownership with *this, or an unspecified nonnegative //!value when *this is empty. //!use_count() is not necessarily efficient. Use only for @@ -292,13 +292,13 @@ class std::shared_ptr //!Exchanges the contents of the two //!smart pointers. - void swap(std::shared_ptr<T, VoidAllocator, Deleter> & other) // never throws + void swap(shared_ptr<T, VoidAllocator, Deleter> & other) // never throws { m_pn.swap(other.m_pn); } /// @cond template<class T2, class A2, class Deleter2> - bool _internal_less(std::shared_ptr<T2, A2, Deleter2> const & rhs) const + bool _internal_less(shared_ptr<T2, A2, Deleter2> const & rhs) const { return m_pn < rhs.m_pn; } const_deleter_pointer get_deleter() const @@ -309,50 +309,50 @@ class std::shared_ptr private: - template<class T2, class A2, class Deleter2> friend class std::shared_ptr; + template<class T2, class A2, class Deleter2> friend class shared_ptr; template<class T2, class A2, class Deleter2> friend class weak_ptr; ipcdetail::shared_count<T, VoidAllocator, Deleter> m_pn; // reference counter /// @endcond -}; // std::shared_ptr +}; // shared_ptr template<class T, class VoidAllocator, class Deleter, class U, class VoidAllocator2, class Deleter2> inline -bool operator==(std::shared_ptr<T, VoidAllocator, Deleter> const & a, std::shared_ptr<U, VoidAllocator2, Deleter2> const & b) +bool operator==(shared_ptr<T, VoidAllocator, Deleter> const & a, shared_ptr<U, VoidAllocator2, Deleter2> const & b) { return a.get() == b.get(); } template<class T, class VoidAllocator, class Deleter, class U, class VoidAllocator2, class Deleter2> inline -bool operator!=(std::shared_ptr<T, VoidAllocator, Deleter> const & a, std::shared_ptr<U, VoidAllocator2, Deleter2> const & b) +bool operator!=(shared_ptr<T, VoidAllocator, Deleter> const & a, shared_ptr<U, VoidAllocator2, Deleter2> const & b) { return a.get() != b.get(); } template<class T, class VoidAllocator, class Deleter, class U, class VoidAllocator2, class Deleter2> inline -bool operator<(std::shared_ptr<T, VoidAllocator, Deleter> const & a, std::shared_ptr<U, VoidAllocator2, Deleter2> const & b) +bool operator<(shared_ptr<T, VoidAllocator, Deleter> const & a, shared_ptr<U, VoidAllocator2, Deleter2> const & b) { return a._internal_less(b); } template<class T, class VoidAllocator, class Deleter> inline -void swap(std::shared_ptr<T, VoidAllocator, Deleter> & a, std::shared_ptr<T, VoidAllocator, Deleter> & b) +void swap(shared_ptr<T, VoidAllocator, Deleter> & a, shared_ptr<T, VoidAllocator, Deleter> & b) { a.swap(b); } template<class T, class VoidAllocator, class Deleter, class U> inline -std::shared_ptr<T, VoidAllocator, Deleter> static_pointer_cast(std::shared_ptr<U, VoidAllocator, Deleter> const & r) -{ return std::shared_ptr<T, VoidAllocator, Deleter>(r, ipcdetail::static_cast_tag()); } +shared_ptr<T, VoidAllocator, Deleter> static_pointer_cast(shared_ptr<U, VoidAllocator, Deleter> const & r) +{ return shared_ptr<T, VoidAllocator, Deleter>(r, ipcdetail::static_cast_tag()); } template<class T, class VoidAllocator, class Deleter, class U> inline -std::shared_ptr<T, VoidAllocator, Deleter> const_pointer_cast(std::shared_ptr<U, VoidAllocator, Deleter> const & r) -{ return std::shared_ptr<T, VoidAllocator, Deleter>(r, ipcdetail::const_cast_tag()); } +shared_ptr<T, VoidAllocator, Deleter> const_pointer_cast(shared_ptr<U, VoidAllocator, Deleter> const & r) +{ return shared_ptr<T, VoidAllocator, Deleter>(r, ipcdetail::const_cast_tag()); } template<class T, class VoidAllocator, class Deleter, class U> inline -std::shared_ptr<T, VoidAllocator, Deleter> dynamic_pointer_cast(std::shared_ptr<U, VoidAllocator, Deleter> const & r) -{ return std::shared_ptr<T, VoidAllocator, Deleter>(r, ipcdetail::dynamic_cast_tag()); } +shared_ptr<T, VoidAllocator, Deleter> dynamic_pointer_cast(shared_ptr<U, VoidAllocator, Deleter> const & r) +{ return shared_ptr<T, VoidAllocator, Deleter>(r, ipcdetail::dynamic_cast_tag()); } -// to_raw_pointer() enables boost::mem_fn to recognize std::shared_ptr +// to_raw_pointer() enables boost::mem_fn to recognize shared_ptr template<class T, class VoidAllocator, class Deleter> inline -T * to_raw_pointer(std::shared_ptr<T, VoidAllocator, Deleter> const & p) +T * to_raw_pointer(shared_ptr<T, VoidAllocator, Deleter> const & p) { return p.get(); } // operator<< template<class E, class T, class Y, class VoidAllocator, class Deleter> inline std::basic_ostream<E, T> & operator<< - (std::basic_ostream<E, T> & os, std::shared_ptr<Y, VoidAllocator, Deleter> const & p) + (std::basic_ostream<E, T> & os, shared_ptr<Y, VoidAllocator, Deleter> const & p) { os << p.get(); return os; } //!Returns the type of a shared pointer @@ -364,7 +364,7 @@ struct managed_shared_ptr { typedef typename ManagedMemory::template allocator<void>::type void_allocator; typedef typename ManagedMemory::template deleter<T>::type deleter; - typedef std::shared_ptr< T, void_allocator, deleter> type; + typedef shared_ptr< T, void_allocator, deleter> type; }; //!Returns an instance of a shared pointer constructed @@ -407,9 +407,9 @@ inline typename managed_shared_ptr<T, ManagedMemory>::type /// @cond #if defined(_MSC_VER) && (_MSC_VER < 1400) -// to_raw_pointer() enables boost::mem_fn to recognize std::shared_ptr +// to_raw_pointer() enables boost::mem_fn to recognize shared_ptr template<class T, class VoidAllocator, class Deleter> inline -T * to_raw_pointer(boost::interprocess::std::shared_ptr<T, VoidAllocator, Deleter> const & p) +T * to_raw_pointer(boost::interprocess::shared_ptr<T, VoidAllocator, Deleter> const & p) { return p.get(); } #endif diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/smart_ptr/weak_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/smart_ptr/weak_ptr.hpp index 6b91cf87..99c8a631 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/smart_ptr/weak_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/interprocess/smart_ptr/weak_ptr.hpp @@ -18,7 +18,7 @@ #include <boost/interprocess/detail/config_begin.hpp> #include <boost/interprocess/detail/workaround.hpp> -#include <boost/interprocess/smart_ptr/std::shared_ptr.hpp> +#include <boost/interprocess/smart_ptr/shared_ptr.hpp> #include <boost/detail/no_exceptions_support.hpp> #include <boost/interprocess/allocators/allocator.hpp> #include <boost/interprocess/smart_ptr/deleter.hpp> @@ -31,13 +31,13 @@ namespace boost{ namespace interprocess{ //!The weak_ptr class template stores a "weak reference" to an object -//!that's already managed by a std::shared_ptr. To access the object, a weak_ptr -//!can be converted to a std::shared_ptr using the std::shared_ptr constructor or the -//!member function lock. When the last std::shared_ptr to the object goes away -//!and the object is deleted, the attempt to obtain a std::shared_ptr from the +//!that's already managed by a shared_ptr. To access the object, a weak_ptr +//!can be converted to a shared_ptr using the shared_ptr constructor or the +//!member function lock. When the last shared_ptr to the object goes away +//!and the object is deleted, the attempt to obtain a shared_ptr from the //!weak_ptr instances that refer to the deleted object will fail: the constructor //!will throw an exception of type bad_weak_ptr, and weak_ptr::lock will -//!return an empty std::shared_ptr. +//!return an empty shared_ptr. //! //!Every weak_ptr meets the CopyConstructible and Assignable requirements //!of the C++ Standard Library, and so can be used in standard library containers. @@ -100,9 +100,9 @@ class weak_ptr weak_ptr(weak_ptr<Y, A, D> const & r) : m_pn(r.m_pn) // never throws { - //Construct a temporary std::shared_ptr so that nobody + //Construct a temporary shared_ptr so that nobody //can destroy the value while constructing this - const std::shared_ptr<T, A, D> &ref = r.lock(); + const shared_ptr<T, A, D> &ref = r.lock(); m_pn.set_pointer(ref.get()); } @@ -114,7 +114,7 @@ class weak_ptr //! //!Throws: nothing. template<class Y> - weak_ptr(std::shared_ptr<Y, A, D> const & r) + weak_ptr(shared_ptr<Y, A, D> const & r) : m_pn(r.m_pn) // never throws {} @@ -127,9 +127,9 @@ class weak_ptr template<class Y> weak_ptr & operator=(weak_ptr<Y, A, D> const & r) // never throws { - //Construct a temporary std::shared_ptr so that nobody + //Construct a temporary shared_ptr so that nobody //can destroy the value while constructing this - const std::shared_ptr<T, A, D> &ref = r.lock(); + const shared_ptr<T, A, D> &ref = r.lock(); m_pn = r.m_pn; m_pn.set_pointer(ref.get()); return *this; @@ -142,30 +142,30 @@ class weak_ptr //!Notes: The implementation is free to meet the effects (and the //!implied guarantees) via different means, without creating a temporary. template<class Y> - weak_ptr & operator=(std::shared_ptr<Y, A, D> const & r) // never throws + weak_ptr & operator=(shared_ptr<Y, A, D> const & r) // never throws { m_pn = r.m_pn; return *this; } - //!Returns: expired()? std::shared_ptr<T>(): std::shared_ptr<T>(*this). + //!Returns: expired()? shared_ptr<T>(): shared_ptr<T>(*this). //! //!Throws: nothing. - std::shared_ptr<T, A, D> lock() const // never throws + shared_ptr<T, A, D> lock() const // never throws { // optimization: avoid throw overhead if(expired()){ - return std::shared_ptr<element_type, A, D>(); + return shared_ptr<element_type, A, D>(); } BOOST_TRY{ - return std::shared_ptr<element_type, A, D>(*this); + return shared_ptr<element_type, A, D>(*this); } BOOST_CATCH(bad_weak_ptr const &){ // Q: how can we get here? // A: another thread may have invalidated r after the use_count test above. - return std::shared_ptr<element_type, A, D>(); + return shared_ptr<element_type, A, D>(); } BOOST_CATCH_END } - //!Returns: 0 if *this is empty; otherwise, the number of std::shared_ptr objects + //!Returns: 0 if *this is empty; otherwise, the number of shared_ptr objects //!that share ownership with *this. //! //!Throws: nothing. @@ -209,7 +209,7 @@ class weak_ptr private: - template<class T2, class A2, class D2> friend class std::shared_ptr; + template<class T2, class A2, class D2> friend class shared_ptr; template<class T2, class A2, class D2> friend class weak_ptr; ipcdetail::weak_count<T, A, D> m_pn; // reference counter diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/chain.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/chain.hpp index 4b046508..4af8cc98 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/chain.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/chain.hpp @@ -22,7 +22,7 @@ #include <stdexcept> // logic_error, out_of_range. #include <boost/checked_delete.hpp> #include <boost/config.hpp> // BOOST_MSVC, template friends, -#include <boost/detail/workaround.hpp> // BOOST_NESTED_TEMPLATE +#include <boost/detail/workaround.hpp> // BOOST_NESTED_TEMPLATE #include <boost/iostreams/constants.hpp> #include <boost/iostreams/detail/access_control.hpp> #include <boost/iostreams/detail/char_traits.hpp> @@ -34,7 +34,7 @@ #include <boost/iostreams/traits.hpp> // is_filter. #include <boost/iostreams/stream_buffer.hpp> #include <boost/next_prior.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/static_assert.hpp> #include <boost/throw_exception.hpp> #include <boost/type_traits/is_convertible.hpp> @@ -141,7 +141,7 @@ protected: chain_base(const chain_base& rhs): pimpl_(rhs.pimpl_) { } public: - // dual_use is a pseudo-mode to facilitate filter writing, + // dual_use is a pseudo-mode to facilitate filter writing, // not a genuine mode. BOOST_STATIC_ASSERT((!is_convertible<mode, dual_use>::value)); @@ -150,19 +150,19 @@ public: // Sets the size of the buffer created for the devices to be added to this // chain. Does not affect the size of the buffer for devices already // added. - void set_device_buffer_size(std::streamsize n) + void set_device_buffer_size(std::streamsize n) { pimpl_->device_buffer_size_ = n; } // Sets the size of the buffer created for the filters to be added // to this chain. Does not affect the size of the buffer for filters already // added. - void set_filter_buffer_size(std::streamsize n) + void set_filter_buffer_size(std::streamsize n) { pimpl_->filter_buffer_size_ = n; } // Sets the size of the putback buffer for filters and devices to be added // to this chain. Does not affect the size of the buffer for filters or // devices already added. - void set_pback_size(std::streamsize n) + void set_pback_size(std::streamsize n) { pimpl_->pback_size_ = n; } //----------Device interface----------------------------------------------// @@ -189,7 +189,7 @@ public: T* component(int n) const { return component(n, boost::type<T>()); } // Deprecated. - template<int N, typename T> + template<int N, typename T> T* component() const { return component<T>(N); } #endif @@ -230,7 +230,7 @@ public: bool strict_sync(); private: template<typename T> - void push_impl(const T& t, std::streamsize buffer_size = -1, + void push_impl(const T& t, std::streamsize buffer_size = -1, std::streamsize pback_size = -1) { typedef typename iostreams::category_of<T>::type category; @@ -331,20 +331,20 @@ private: links_.front()->BOOST_IOSTREAMS_PUBSYNC(); try { boost::iostreams::detail::execute_foreach( - links_.rbegin(), links_.rend(), + links_.rbegin(), links_.rend(), closer(BOOST_IOS::in) ); } catch (...) { try { boost::iostreams::detail::execute_foreach( - links_.begin(), links_.end(), + links_.begin(), links_.end(), closer(BOOST_IOS::out) ); } catch (...) { } throw; } boost::iostreams::detail::execute_foreach( - links_.begin(), links_.end(), + links_.begin(), links_.end(), closer(BOOST_IOS::out) ); } @@ -382,7 +382,7 @@ private: //----------Member data---------------------------------------------------// private: - std::shared_ptr<chain_impl> pimpl_; + shared_ptr<chain_impl> pimpl_; }; } // End namespace detail. diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/code_converter.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/code_converter.hpp index 8ff85a18..280a5d09 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/code_converter.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/code_converter.hpp @@ -24,7 +24,7 @@ #include <algorithm> // max. #include <cstring> // memcpy. #include <exception> -#include <boost/config.hpp> // DEDUCED_TYPENAME, +#include <boost/config.hpp> // DEDUCED_TYPENAME, #include <boost/iostreams/char_traits.hpp> #include <boost/iostreams/constants.hpp> // default_filter_buffer_size. #include <boost/iostreams/detail/adapter/concept_adapter.hpp> @@ -42,7 +42,7 @@ #include <boost/iostreams/detail/select.hpp> #include <boost/iostreams/traits.hpp> #include <boost/iostreams/operations.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/static_assert.hpp> #include <boost/throw_exception.hpp> #include <boost/type_traits/is_convertible.hpp> @@ -54,7 +54,7 @@ namespace boost { namespace iostreams { struct code_conversion_error : BOOST_IOSTREAMS_FAILURE { - code_conversion_error() + code_conversion_error() : BOOST_IOSTREAMS_FAILURE("code conversion error") { } }; @@ -91,28 +91,28 @@ Tgt* strncpy_if_same(Tgt* tgt, const Src* src, std::streamsize n) // Buffer and conversion state for reading. template<typename Codecvt, typename Alloc> -class conversion_buffer +class conversion_buffer : public buffer< BOOST_DEDUCED_TYPENAME detail::codecvt_extern<Codecvt>::type, Alloc - > + > { public: typedef typename Codecvt::state_type state_type; - conversion_buffer() + conversion_buffer() : buffer< BOOST_DEDUCED_TYPENAME detail::codecvt_extern<Codecvt>::type, Alloc - >(0) - { - reset(); + >(0) + { + reset(); } state_type& state() { return state_; } - void reset() - { - if (this->size()) + void reset() + { + if (this->size()) this->set(0, 0); - state_ = state_type(); + state_ = state_type(); } private: state_type state_; @@ -128,12 +128,12 @@ struct code_converter_impl { typedef is_convertible<device_category, input> can_read; typedef is_convertible<device_category, output> can_write; typedef is_convertible<device_category, bidirectional> is_bidir; - typedef typename + typedef typename iostreams::select< // Disambiguation for Tru64. is_bidir, bidirectional, can_read, input, can_write, output - >::type mode; + >::type mode; typedef typename mpl::if_< is_direct<Device>, @@ -147,10 +147,10 @@ struct code_converter_impl { code_converter_impl() : cvt_(), flags_(0) { } ~code_converter_impl() - { - try { - if (flags_ & f_open) close(); - } catch (...) { /* */ } + { + try { + if (flags_ & f_open) close(); + } catch (...) { /* */ } } template <class T> @@ -213,7 +213,7 @@ struct code_converter_impl { codecvt_holder<Codecvt> cvt_; storage_type dev_; double_object< - buffer_type, + buffer_type, is_double > buf_; int flags_; @@ -232,13 +232,13 @@ struct code_converter_base { Device, Codecvt, Alloc > impl_type; code_converter_base() : pimpl_(new impl_type) { } - std::shared_ptr<impl_type> pimpl_; + shared_ptr<impl_type> pimpl_; }; -template< typename Device, - typename Codecvt = detail::default_codecvt, +template< typename Device, + typename Codecvt = detail::default_codecvt, typename Alloc = std::allocator<char> > -class code_converter +class code_converter : protected code_converter_base<Device, Codecvt, Alloc> { private: @@ -252,28 +252,28 @@ private: typedef typename detail::codecvt_extern<Codecvt>::type extern_type; typedef typename detail::codecvt_state<Codecvt>::type state_type; public: - typedef intern_type char_type; - struct category + typedef intern_type char_type; + struct category : impl_type::mode, device_tag, closable_tag, localizable_tag { }; BOOST_STATIC_ASSERT(( is_same< - extern_type, + extern_type, BOOST_DEDUCED_TYPENAME char_type_of<Device>::type >::value )); public: code_converter() { } #if BOOST_WORKAROUND(__GNUC__, < 3) - code_converter(code_converter& rhs) + code_converter(code_converter& rhs) : code_converter_base<Device, Codecvt, Alloc>(rhs) { } - code_converter(const code_converter& rhs) + code_converter(const code_converter& rhs) : code_converter_base<Device, Codecvt, Alloc>(rhs) { } #endif BOOST_IOSTREAMS_FORWARD( code_converter, open_impl, Device, - BOOST_IOSTREAMS_CONVERTER_PARAMS, + BOOST_IOSTREAMS_CONVERTER_PARAMS, BOOST_IOSTREAMS_CONVERTER_ARGS ) // fstream-like interface. @@ -294,9 +294,9 @@ public: Device* operator->() { return &detail::unwrap_direct(dev()); } private: template<typename T> // Used for forwarding. - void open_impl(const T& t BOOST_IOSTREAMS_CONVERTER_PARAMS()) - { - impl().open(t BOOST_IOSTREAMS_CONVERTER_ARGS()); + void open_impl(const T& t BOOST_IOSTREAMS_CONVERTER_PARAMS()) + { + impl().open(t BOOST_IOSTREAMS_CONVERTER_ARGS()); } const codecvt_type& cvt() { return impl().cvt_.get(); } @@ -347,7 +347,7 @@ std::streamsize code_converter<Device, Codevt, Alloc>::read break; case std::codecvt_base::noconv: { - std::streamsize amt = + std::streamsize amt = std::min<std::streamsize>(next - buf.ptr(), n - total); detail::strncpy_if_same(s + total, buf.ptr(), amt); total += amt; @@ -382,7 +382,7 @@ std::streamsize code_converter<Device, Codevt, Alloc>::write break; partial = false; } - + // Convert. std::codecvt_base::result result = cvt().out( buf.state(), @@ -399,8 +399,8 @@ std::streamsize code_converter<Device, Codevt, Alloc>::write break; case std::codecvt_base::noconv: { - std::streamsize amt = - std::min<std::streamsize>( nint - total - s, + std::streamsize amt = + std::min<std::streamsize>( nint - total - s, buf.end() - buf.eptr() ); detail::strncpy_if_same(buf.eptr(), s + total, amt); total += amt; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/device/file.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/device/file.hpp index c04b2536..f701c9d6 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/device/file.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/device/file.hpp @@ -21,7 +21,7 @@ #include <boost/iostreams/detail/ios.hpp> // openmode, seekdir, int types. #include <boost/iostreams/detail/fstream.hpp> #include <boost/iostreams/operations.hpp> // seek. -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> // Must come last. #include <boost/iostreams/detail/config/disable_warnings.hpp> // MSVC. @@ -46,8 +46,8 @@ public: std::streamsize read(char_type* s, std::streamsize n); bool putback(char_type c); std::streamsize write(const char_type* s, std::streamsize n); - std::streampos seek( stream_offset off, BOOST_IOS::seekdir way, - BOOST_IOS::openmode which = + std::streampos seek( stream_offset off, BOOST_IOS::seekdir way, + BOOST_IOS::openmode which = BOOST_IOS::in | BOOST_IOS::out ); void open( const std::string& path, BOOST_IOS::openmode mode = @@ -67,7 +67,7 @@ private: ~impl() { if (file_.is_open()) file_.close(); } BOOST_IOSTREAMS_BASIC_FILEBUF(Ch) file_; }; - std::shared_ptr<impl> pimpl_; + shared_ptr<impl> pimpl_; }; typedef basic_file<char> file; @@ -87,7 +87,7 @@ struct basic_file_source : private basic_file<Ch> { using basic_file<Ch>::is_open; using basic_file<Ch>::close; basic_file_source( const std::string& path, - BOOST_IOS::openmode mode = + BOOST_IOS::openmode mode = BOOST_IOS::in ) : basic_file<Ch>(path, mode & ~BOOST_IOS::out, BOOST_IOS::in) { } @@ -128,29 +128,29 @@ struct basic_file_sink : private basic_file<Ch> { typedef basic_file_sink<char> file_sink; typedef basic_file_sink<wchar_t> wfile_sink; - + //------------------Implementation of basic_file------------------------------// template<typename Ch> basic_file<Ch>::basic_file - ( const std::string& path, BOOST_IOS::openmode mode, + ( const std::string& path, BOOST_IOS::openmode mode, BOOST_IOS::openmode base_mode ) -{ +{ open(path, mode, base_mode); } template<typename Ch> inline std::streamsize basic_file<Ch>::read (char_type* s, std::streamsize n) -{ - std::streamsize result = pimpl_->file_.sgetn(s, n); +{ + std::streamsize result = pimpl_->file_.sgetn(s, n); return result != 0 ? result : -1; } template<typename Ch> inline bool basic_file<Ch>::putback(char_type c) -{ - return !!pimpl_->file_.sputbackc(c); +{ + return !!pimpl_->file_.sputbackc(c); } template<typename Ch> @@ -160,15 +160,15 @@ inline std::streamsize basic_file<Ch>::write template<typename Ch> std::streampos basic_file<Ch>::seek - ( stream_offset off, BOOST_IOS::seekdir way, + ( stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode ) { return iostreams::seek(pimpl_->file_, off, way); } template<typename Ch> void basic_file<Ch>::open - ( const std::string& path, BOOST_IOS::openmode mode, + ( const std::string& path, BOOST_IOS::openmode mode, BOOST_IOS::openmode base_mode ) -{ +{ pimpl_.reset(new impl(path, mode | base_mode)); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/device/file_descriptor.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/device/file_descriptor.hpp index 1237ea8a..bb470589 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/device/file_descriptor.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/device/file_descriptor.hpp @@ -25,7 +25,7 @@ #include <boost/iostreams/detail/ios.hpp> // openmode, seekdir, int types. #include <boost/iostreams/detail/path.hpp> #include <boost/iostreams/positioning.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> // Must come last. #include <boost/config/abi_prefix.hpp> @@ -86,9 +86,9 @@ public: explicit file_descriptor( const Path& path, BOOST_IOS::openmode mode = BOOST_IOS::in | BOOST_IOS::out ) - { + { init(); - open(detail::path(path), mode); + open(detail::path(path), mode); } // Copy constructor @@ -135,12 +135,12 @@ private: void init(); // open overload taking a detail::path - void open( const detail::path& path, - BOOST_IOS::openmode, + void open( const detail::path& path, + BOOST_IOS::openmode, BOOST_IOS::openmode = BOOST_IOS::openmode(0) ); typedef detail::file_descriptor_impl impl_type; - std::shared_ptr<impl_type> pimpl_; + shared_ptr<impl_type> pimpl_; }; class BOOST_IOSTREAMS_DECL file_descriptor_source : private file_descriptor { @@ -293,16 +293,16 @@ public: #endif // open overload taking a std::string - void open( const std::string& path, + void open( const std::string& path, BOOST_IOS::openmode mode = BOOST_IOS::out ); // open overload taking C-style string - void open( const char* path, + void open( const char* path, BOOST_IOS::openmode mode = BOOST_IOS::out ); // open overload taking a Boost.Filesystem path template<typename Path> - void open( const Path& path, + void open( const Path& path, BOOST_IOS::openmode mode = BOOST_IOS::out ) { open(detail::path(path), mode); } private: diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/device/mapped_file.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/device/mapped_file.hpp index 11c0e2c1..8493b177 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/device/mapped_file.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/device/mapped_file.hpp @@ -26,7 +26,7 @@ #include <boost/iostreams/detail/path.hpp> #include <boost/iostreams/operations_fwd.hpp> #include <boost/iostreams/positioning.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/static_assert.hpp> #include <boost/throw_exception.hpp> #include <boost/type_traits/is_same.hpp> @@ -54,25 +54,25 @@ public: }; // Bitmask operations for mapped_file_base::mapmode -mapped_file_base::mapmode +mapped_file_base::mapmode operator|(mapped_file_base::mapmode a, mapped_file_base::mapmode b); -mapped_file_base::mapmode +mapped_file_base::mapmode operator&(mapped_file_base::mapmode a, mapped_file_base::mapmode b); -mapped_file_base::mapmode +mapped_file_base::mapmode operator^(mapped_file_base::mapmode a, mapped_file_base::mapmode b); -mapped_file_base::mapmode +mapped_file_base::mapmode operator~(mapped_file_base::mapmode a); -mapped_file_base::mapmode +mapped_file_base::mapmode operator|=(mapped_file_base::mapmode& a, mapped_file_base::mapmode b); -mapped_file_base::mapmode +mapped_file_base::mapmode operator&=(mapped_file_base::mapmode& a, mapped_file_base::mapmode b); -mapped_file_base::mapmode +mapped_file_base::mapmode operator^=(mapped_file_base::mapmode& a, mapped_file_base::mapmode b); //------------------Definition of mapped_file_params--------------------------// @@ -81,8 +81,8 @@ namespace detail { struct mapped_file_params_base { mapped_file_params_base() - : flags(static_cast<mapped_file_base::mapmode>(0)), - mode(), offset(0), length(static_cast<std::size_t>(-1)), + : flags(static_cast<mapped_file_base::mapmode>(0)), + mode(), offset(0), length(static_cast<std::size_t>(-1)), new_file_size(0), hint(0) { } private: @@ -102,16 +102,16 @@ public: // This template allows Boost.Filesystem paths to be specified when creating or // reopening a memory mapped file, without creating a dependence on // Boost.Filesystem. Possible values of Path include std::string, -// boost::filesystem::path, boost::filesystem::wpath, +// boost::filesystem::path, boost::filesystem::wpath, // and boost::iostreams::detail::path (used to store either a std::string or a // std::wstring). template<typename Path> -struct basic_mapped_file_params - : detail::mapped_file_params_base +struct basic_mapped_file_params + : detail::mapped_file_params_base { typedef detail::mapped_file_params_base base_type; - // For wide paths, instantiate basic_mapped_file_params + // For wide paths, instantiate basic_mapped_file_params // with boost::filesystem::wpath #ifndef BOOST_IOSTREAMS_NO_WIDE_STREAMS BOOST_STATIC_ASSERT((!is_same<Path, std::wstring>::value)); @@ -215,7 +215,7 @@ private: void init(); void open_impl(const param_type& p); - boost::std::shared_ptr<impl_type> pimpl_; + boost::shared_ptr<impl_type> pimpl_; }; //------------------Definition of mapped_file---------------------------------// @@ -253,7 +253,7 @@ public: size_type length = max_length, stream_offset offset = 0 ); - // Constructor taking a list of parameters, including a + // Constructor taking a list of parameters, including a // std::ios_base::openmode (deprecated) template<typename Path> explicit mapped_file( const Path& path, @@ -283,7 +283,7 @@ public: size_type length = max_length, stream_offset offset = 0 ); - // open overload taking a list of parameters, including a + // open overload taking a list of parameters, including a // std::ios_base::openmode (deprecated) template<typename Path> void open( const Path& path, @@ -387,7 +387,7 @@ mapped_file_source::mapped_file_source(const basic_mapped_file_params<Path>& p) { init(); open(p); } template<typename Path> -mapped_file_source::mapped_file_source( +mapped_file_source::mapped_file_source( const Path& path, size_type length, boost::intmax_t offset) { init(); open(path, length, offset); } @@ -423,14 +423,14 @@ mapped_file::mapped_file(const basic_mapped_file_params<Path>& p) { open(p); } template<typename Path> -mapped_file::mapped_file( - const Path& path, mapmode flags, +mapped_file::mapped_file( + const Path& path, mapmode flags, size_type length, stream_offset offset ) { open(path, flags, length, offset); } template<typename Path> -mapped_file::mapped_file( - const Path& path, BOOST_IOS::openmode mode, +mapped_file::mapped_file( + const Path& path, BOOST_IOS::openmode mode, size_type length, stream_offset offset ) { open(path, mode, length, offset); } @@ -439,8 +439,8 @@ void mapped_file::open(const basic_mapped_file_params<Path>& p) { delegate_.open_impl(p); } template<typename Path> -void mapped_file::open( - const Path& path, mapmode flags, +void mapped_file::open( + const Path& path, mapmode flags, size_type length, stream_offset offset ) { param_type p(path); @@ -451,8 +451,8 @@ void mapped_file::open( } template<typename Path> -void mapped_file::open( - const Path& path, BOOST_IOS::openmode mode, +void mapped_file::open( + const Path& path, BOOST_IOS::openmode mode, size_type length, stream_offset offset ) { param_type p(path); @@ -462,7 +462,7 @@ void mapped_file::open( open(p); } -inline char* mapped_file::data() const +inline char* mapped_file::data() const { return (flags() != readonly) ? const_cast<char*>(delegate_.data()) : 0; } //------------------Implementation of mapped_file_sink------------------------// @@ -524,13 +524,13 @@ struct operations<mapped_file> { static std::pair<char*, char*> input_sequence(mapped_file& file) - { - return std::make_pair(file.begin(), file.end()); + { + return std::make_pair(file.begin(), file.end()); } static std::pair<char*, char*> output_sequence(mapped_file& file) - { - return std::make_pair(file.begin(), file.end()); + { + return std::make_pair(file.begin(), file.end()); } }; @@ -540,28 +540,28 @@ struct operations<mapped_file_sink> { static std::pair<char*, char*> output_sequence(mapped_file_sink& sink) - { - return std::make_pair(sink.begin(), sink.end()); + { + return std::make_pair(sink.begin(), sink.end()); } }; - + //------------------Definition of mapmode operators---------------------------// -inline mapped_file::mapmode +inline mapped_file::mapmode operator|(mapped_file::mapmode a, mapped_file::mapmode b) { return static_cast<mapped_file::mapmode> (static_cast<int>(a) | static_cast<int>(b)); } -inline mapped_file::mapmode +inline mapped_file::mapmode operator&(mapped_file::mapmode a, mapped_file::mapmode b) { return static_cast<mapped_file::mapmode> (static_cast<int>(a) & static_cast<int>(b)); } -inline mapped_file::mapmode +inline mapped_file::mapmode operator^(mapped_file::mapmode a, mapped_file::mapmode b) { return static_cast<mapped_file::mapmode> @@ -574,19 +574,19 @@ operator~(mapped_file::mapmode a) return static_cast<mapped_file::mapmode>(~static_cast<int>(a)); } -inline mapped_file::mapmode +inline mapped_file::mapmode operator|=(mapped_file::mapmode& a, mapped_file::mapmode b) { return a = a | b; } -inline mapped_file::mapmode +inline mapped_file::mapmode operator&=(mapped_file::mapmode& a, mapped_file::mapmode b) { return a = a & b; } -inline mapped_file::mapmode +inline mapped_file::mapmode operator^=(mapped_file::mapmode& a, mapped_file::mapmode b) { return a = a ^ b; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/filter/symmetric.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/filter/symmetric.hpp index 1feff246..cc92b0cf 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/filter/symmetric.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/filter/symmetric.hpp @@ -20,12 +20,12 @@ // // Consume as many characters as possible from the interval // // [begin_in, end_in), without exhausting the output range // // [begin_out, end_out). If flush is true, write as mush output -// // as possible. -// // A return value of true indicates that filter should be called -// // again. More precisely, if flush is false, a return value of +// // as possible. +// // A return value of true indicates that filter should be called +// // again. More precisely, if flush is false, a return value of // // false indicates that the natural end of stream has been reached // // and that all filtered data has been forwarded; if flush is -// // true, a return value of false indicates that all filtered data +// // true, a return value of false indicates that all filtered data // // has been forwarded. // } // void close() { /* Reset filter's state. */ } @@ -57,7 +57,7 @@ #include <boost/preprocessor/punctuation/comma_if.hpp> #include <boost/preprocessor/repetition/enum_binary_params.hpp> #include <boost/preprocessor/repetition/enum_params.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> // Must come last. #include <boost/iostreams/detail/config/disable_warnings.hpp> // MSVC. @@ -188,7 +188,7 @@ public: string_type unconsumed_input() const; // Give impl access to buffer_type on Tru64 -#if !BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042)) +#if !BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042)) private: #endif typedef detail::buffer<char_type, Alloc> buffer_type; @@ -266,7 +266,7 @@ private: int state_; }; - std::shared_ptr<impl> pimpl_; + shared_ptr<impl> pimpl_; }; BOOST_IOSTREAMS_PIPABLE(symmetric_filter, 2) diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/invert.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/invert.hpp index 2348a2fe..82e6a4b4 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/invert.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iostreams/invert.hpp @@ -10,11 +10,11 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once -#endif +#endif -#include <algorithm> // copy, min. +#include <algorithm> // copy, min. #include <boost/assert.hpp> -#include <boost/config.hpp> // BOOST_DEDUCED_TYPENAME. +#include <boost/config.hpp> // BOOST_DEDUCED_TYPENAME. #include <boost/detail/workaround.hpp> // default_filter_buffer_size. #include <boost/iostreams/char_traits.hpp> #include <boost/iostreams/compose.hpp> @@ -26,7 +26,7 @@ #include <boost/iostreams/detail/functional.hpp> // clear_flags, call_reset #include <boost/mpl/if.hpp> #include <boost/ref.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/type_traits/is_convertible.hpp> // Must come last. @@ -51,7 +51,7 @@ public: typedef typename char_type_of<Filter>::type char_type; typedef typename int_type_of<Filter>::type int_type; typedef char_traits<char_type> traits_type; - typedef typename + typedef typename mpl::if_< is_convertible< base_category, @@ -60,15 +60,15 @@ public: output, input >::type mode; - struct category - : mode, - filter_tag, - multichar_tag, - closable_tag + struct category + : mode, + filter_tag, + multichar_tag, + closable_tag { }; - explicit inverse( const Filter& filter, - std::streamsize buffer_size = - default_filter_buffer_size) + explicit inverse( const Filter& filter, + std::streamsize buffer_size = + default_filter_buffer_size) : pimpl_(new impl(filter, buffer_size)) { } @@ -93,10 +93,10 @@ public: buf().flush(snk); } return snk.second().count() == 0 && - status == traits_type::eof() - ? + status == traits_type::eof() + ? -1 - : + : snk.second().count(); } @@ -111,7 +111,7 @@ public: flags() = f_write; buf().set(0, 0); } - + filtered_array_source src(filter(), array_source(s, n)); for (bool good = true; src.second().count() < n && good; ) { buf().fill(src); @@ -133,20 +133,20 @@ private: filter_ref filter() { return boost::ref(pimpl_->filter_); } detail::buffer<char_type>& buf() { return pimpl_->buf_; } int& flags() { return pimpl_->flags_; } - + enum flags_ { f_read = 1, f_write = 2 }; struct impl { - impl(const Filter& filter, std::streamsize n) + impl(const Filter& filter, std::streamsize n) : filter_(filter), buf_(n), flags_(0) { buf_.set(0, 0); } Filter filter_; detail::buffer<char_type> buf_; int flags_; }; - std::shared_ptr<impl> pimpl_; + shared_ptr<impl> pimpl_; }; // @@ -157,7 +157,7 @@ private: // template<typename Filter> inverse<Filter> invert(const Filter& f) { return inverse<Filter>(f); } - + //----------------------------------------------------------------------------// } } // End namespaces iostreams, boost. diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iterator/indirect_iterator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iterator/indirect_iterator.hpp index 00fdedff..abff7e76 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iterator/indirect_iterator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/iterator/indirect_iterator.hpp @@ -26,11 +26,11 @@ #include <boost/mpl/has_xxx.hpp> #ifdef BOOST_MPL_CFG_NO_HAS_XXX -# include <boost/std::shared_ptr.hpp> +# include <boost/shared_ptr.hpp> # include <boost/scoped_ptr.hpp> # include <boost/mpl/bool.hpp> # include <memory> -#endif +#endif #include <boost/iterator/detail/config_def.hpp> // must be last #include @@ -45,7 +45,7 @@ namespace boost struct indirect_base { typedef typename iterator_traits<Iter>::value_type dereferenceable; - + typedef iterator_adaptor< indirect_iterator<Iter, Value, Category, Reference, Difference> , Iter @@ -69,7 +69,7 @@ namespace boost struct indirect_base<int, int, int, int, int> {}; } // namespace detail - + template < class Iterator , class Value = use_default @@ -107,14 +107,14 @@ namespace boost : super_t(y.base()) {} - private: + private: typename super_t::reference dereference() const { # if BOOST_WORKAROUND(__BORLANDC__, < 0x5A0 ) return const_cast<super_t::reference>(**this->base()); # else return **this->base(); -# endif +# endif } }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/locale/boundary/index.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/locale/boundary/index.hpp index 81adff7e..5948dcca 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/locale/boundary/index.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/locale/boundary/index.hpp @@ -15,7 +15,7 @@ #include <boost/locale/boundary/boundary_point.hpp> #include <boost/iterator/iterator_facade.hpp> #include <boost/type_traits/is_same.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/cstdint.hpp> #include <boost/assert.hpp> #ifdef BOOST_MSVC @@ -34,7 +34,7 @@ namespace boost { namespace locale { - + namespace boundary { /// /// \defgroup boundary Boundary Analysis @@ -88,7 +88,7 @@ namespace boost { // // C++0x requires that string is continious in memory and all known // string implementations - // do this because of c_str() support. + // do this because of c_str() support. // if(linear_iterator_traits<char_type,IteratorType>::is_linear && b!=e) @@ -117,8 +117,8 @@ namespace boost { mapping(boundary_type type, base_iterator begin, base_iterator end, - std::locale const &loc) - : + std::locale const &loc) + : index_(new index_type()), begin_(begin), end_(end) @@ -147,12 +147,12 @@ namespace boost { } private: - boost::std::shared_ptr<index_type> index_; + boost::shared_ptr<index_type> index_; base_iterator begin_,end_; }; template<typename BaseIterator> - class segment_index_iterator : + class segment_index_iterator : public boost::iterator_facade< segment_index_iterator<BaseIterator>, segment<BaseIterator>, @@ -164,7 +164,7 @@ namespace boost { typedef BaseIterator base_iterator; typedef mapping<base_iterator> mapping_type; typedef segment<base_iterator> segment_type; - + segment_index_iterator() : current_(0,0),map_(0) { } @@ -267,13 +267,13 @@ namespace boost { { size_t dist=std::distance(map_->begin(),p); index_type::const_iterator b=map_->index().begin(),e=map_->index().end(); - index_type::const_iterator + index_type::const_iterator boundary_point=std::upper_bound(b,e,break_info(dist)); while(boundary_point != e && (boundary_point->rule & mask_)==0) boundary_point++; current_.first = current_.second = boundary_point - b; - + if(full_select_) { while(current_.first > 0) { current_.first --; @@ -318,31 +318,31 @@ namespace boost { bool valid_offset(size_t offset) const { - return offset == 0 + return offset == 0 || offset == size() // make sure we not acess index[size] || (index()[offset].rule & mask_)!=0; } - + size_t size() const { return index().size(); } - + index_type const &index() const { return map_->index(); } - - + + segment_type value_; std::pair<size_t,size_t> current_; mapping_type const *map_; rule_type mask_; bool full_select_; }; - + template<typename BaseIterator> - class boundary_point_index_iterator : + class boundary_point_index_iterator : public boost::iterator_facade< boundary_point_index_iterator<BaseIterator>, boundary_point<BaseIterator>, @@ -354,7 +354,7 @@ namespace boost { typedef BaseIterator base_iterator; typedef mapping<base_iterator> mapping_type; typedef boundary_point<base_iterator> boundary_point_type; - + boundary_point_index_iterator() : current_(0),map_(0) { } @@ -466,22 +466,22 @@ namespace boost { bool valid_offset(size_t offset) const { - return offset == 0 + return offset == 0 || offset + 1 >= size() // last and first are always valid regardless of mark || (index()[offset].rule & mask_)!=0; } - + size_t size() const { return index().size(); } - + index_type const &index() const { return map_->index(); } - - + + boundary_point_type value_; size_t current_; mapping_type const *map_; @@ -498,10 +498,10 @@ namespace boost { template<typename BaseIterator> class boundary_point_index; - + /// - /// \brief This class holds an index of segments in the text range and allows to iterate over them + /// \brief This class holds an index of segments in the text range and allows to iterate over them /// /// This class is provides \ref begin() and \ref end() member functions that return bidirectional iterators /// to the \ref segment objects. @@ -512,7 +512,7 @@ namespace boost { /// various masks %as \ref word_any. /// \n /// The default is to select any types of boundaries. - /// \n + /// \n /// For example: using word %boundary analysis, when the provided mask is \ref word_kana then the iterators /// would iterate only over the words containing Kana letters and \ref word_any would select all types of /// words excluding ranges that consist of white space and punctuation marks. So iterating over the text @@ -533,7 +533,7 @@ namespace boost { /// terminator "!" or "?". But changing \ref full_select() to true, the selected segment would include /// all the text up to previous valid %boundary point and would return two expected sentences: /// "Hello!" and "How\nare you?". - /// + /// /// This class allows to find a segment according to the given iterator in range using \ref find() member /// function. /// @@ -555,7 +555,7 @@ namespace boost { template<typename BaseIterator> class segment_index { public: - + /// /// The type of the iterator used to iterate over the original text /// @@ -591,7 +591,7 @@ namespace boost { typedef segment<base_iterator> value_type; /// - /// Default constructor. + /// Default constructor. /// /// \note /// @@ -610,7 +610,7 @@ namespace boost { base_iterator begin, base_iterator end, rule_type mask, - std::locale const &loc=std::locale()) + std::locale const &loc=std::locale()) : map_(type,begin,end,loc), mask_(mask), @@ -624,7 +624,7 @@ namespace boost { segment_index(boundary_type type, base_iterator begin, base_iterator end, - std::locale const &loc=std::locale()) + std::locale const &loc=std::locale()) : map_(type,begin,end,loc), mask_(0xFFFFFFFFu), @@ -655,7 +655,7 @@ namespace boost { /// segment_index const &operator = (boundary_point_index<base_iterator> const &); - + /// /// Create a new index for %boundary analysis \ref boundary_type "type" of the text /// in range [begin,end) for locale \a loc. @@ -694,7 +694,7 @@ namespace boost { } /// - /// Find a first valid segment following a position \a p. + /// Find a first valid segment following a position \a p. /// /// If \a p is inside a valid segment this segment is selected: /// @@ -704,7 +704,7 @@ namespace boost { /// - "t|o be or ", would point to "to", /// - "to be or| ", would point to end. /// - /// + /// /// Preconditions: the segment_index should have a mapping and \a p should be valid iterator /// to the text in the mapped range. /// @@ -714,17 +714,17 @@ namespace boost { { return iterator(p,&map_,mask_,full_select_); } - + /// /// Get the mask of rules that are used - /// + /// rule_type rule() const { return mask_; } /// /// Set the mask of rules that are used - /// + /// void rule(rule_type v) { mask_ = v; @@ -743,7 +743,7 @@ namespace boost { /// following part "are you?" /// - bool full_select() const + bool full_select() const { return full_select_; } @@ -761,11 +761,11 @@ namespace boost { /// following part "are you?" /// - void full_select(bool v) + void full_select(bool v) { full_select_ = v; } - + private: friend class boundary_point_index<base_iterator>; typedef details::mapping<base_iterator> mapping_type; @@ -793,14 +793,14 @@ namespace boost { /// - "Hello! How\n|are you?" /// - "Hello! How\nare you?|" /// - /// However if \ref rule() is set to \ref sentence_term then the selected %boundary points would be: + /// However if \ref rule() is set to \ref sentence_term then the selected %boundary points would be: /// /// - "|Hello! How\nare you?" /// - "Hello! |How\nare you?" /// - "Hello! How\nare you?|" - /// + /// /// Such that a %boundary point defined by a line feed character would be ignored. - /// + /// /// This class allows to find a boundary_point according to the given iterator in range using \ref find() member /// function. /// @@ -858,9 +858,9 @@ namespace boost { /// an object that represents the selected \ref boundary_point "boundary point". /// typedef boundary_point<base_iterator> value_type; - + /// - /// Default constructor. + /// Default constructor. /// /// \note /// @@ -871,7 +871,7 @@ namespace boost { boundary_point_index() : mask_(0xFFFFFFFFu) { } - + /// /// Create a segment_index for %boundary analysis \ref boundary_type "type" of the text /// in range [begin,end) using a rule \a mask for locale \a loc. @@ -880,7 +880,7 @@ namespace boost { base_iterator begin, base_iterator end, rule_type mask, - std::locale const &loc=std::locale()) + std::locale const &loc=std::locale()) : map_(type,begin,end,loc), mask_(mask) @@ -893,7 +893,7 @@ namespace boost { boundary_point_index(boundary_type type, base_iterator begin, base_iterator end, - std::locale const &loc=std::locale()) + std::locale const &loc=std::locale()) : map_(type,begin,end,loc), mask_(0xFFFFFFFFu) @@ -969,7 +969,7 @@ namespace boost { /// /// - "|to be", would return %boundary point at "|to be", /// - "t|o be", would point to "to| be" - /// + /// /// Preconditions: the boundary_point_index should have a mapping and \a p should be valid iterator /// to the text in the mapped range. /// @@ -979,17 +979,17 @@ namespace boost { { return iterator(p,&map_,mask_); } - + /// /// Get the mask of rules that are used - /// + /// rule_type rule() const { return mask_; } /// /// Set the mask of rules that are used - /// + /// void rule(rule_type v) { mask_ = v; @@ -1002,8 +1002,8 @@ namespace boost { mapping_type map_; rule_type mask_; }; - - /// \cond INTERNAL + + /// \cond INTERNAL template<typename BaseIterator> segment_index<BaseIterator>::segment_index(boundary_point_index<BaseIterator> const &other) : map_(other.map_), @@ -1011,7 +1011,7 @@ namespace boost { full_select_(false) { } - + template<typename BaseIterator> boundary_point_index<BaseIterator>::boundary_point_index(segment_index<BaseIterator> const &other) : map_(other.map_), @@ -1025,7 +1025,7 @@ namespace boost { map_ = other.map_; return *this; } - + template<typename BaseIterator> boundary_point_index<BaseIterator> const &boundary_point_index<BaseIterator>::operator=(segment_index<BaseIterator> const &other) { @@ -1033,7 +1033,7 @@ namespace boost { return *this; } /// \endcond - + typedef segment_index<std::string::const_iterator> ssegment_index; ///< convenience typedef typedef segment_index<std::wstring::const_iterator> wssegment_index; ///< convenience typedef #ifdef BOOST_HAS_CHAR16_T @@ -1042,7 +1042,7 @@ namespace boost { #ifdef BOOST_HAS_CHAR32_T typedef segment_index<std::u32string::const_iterator> u32ssegment_index;///< convenience typedef #endif - + typedef segment_index<char const *> csegment_index; ///< convenience typedef typedef segment_index<wchar_t const *> wcsegment_index; ///< convenience typedef #ifdef BOOST_HAS_CHAR16_T @@ -1060,7 +1060,7 @@ namespace boost { #ifdef BOOST_HAS_CHAR32_T typedef boundary_point_index<std::u32string::const_iterator> u32sboundary_point_index;///< convenience typedef #endif - + typedef boundary_point_index<char const *> cboundary_point_index; ///< convenience typedef typedef boundary_point_index<wchar_t const *> wcboundary_point_index; ///< convenience typedef #ifdef BOOST_HAS_CHAR16_T diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/locale/generator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/locale/generator.hpp index e586b32c..cd34a6fc 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/locale/generator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/locale/generator.hpp @@ -20,10 +20,10 @@ namespace boost { template<typename Type> - class std::shared_ptr; + class shared_ptr; /// - /// \brief This is the main namespace that encloses all localization classes + /// \brief This is the main namespace that encloses all localization classes /// namespace locale { @@ -39,7 +39,7 @@ namespace boost { static const uint32_t character_first_facet = char_facet; ///< First facet specific for character type static const uint32_t character_last_facet = char32_t_facet; ///< Last facet specific for character type static const uint32_t all_characters = 0xFFFF; ///< Special mask -- generate all - + typedef uint32_t character_facet_type; ///<type that specifies the character type that locales can be generated for static const uint32_t convert_facet = 1 << 0; ///< Generate conversion facets @@ -49,19 +49,19 @@ namespace boost { static const uint32_t message_facet = 1 << 4; ///< Generate message facets static const uint32_t codepage_facet = 1 << 5; ///< Generate character set conversion facets (derived from std::codecvt) static const uint32_t boundary_facet = 1 << 6; ///< Generate boundary analysis facet - + static const uint32_t per_character_facet_first = convert_facet; ///< First facet specific for character static const uint32_t per_character_facet_last = boundary_facet; ///< Last facet specific for character static const uint32_t calendar_facet = 1 << 16; ///< Generate boundary analysis facet static const uint32_t information_facet = 1 << 17; ///< Generate general locale information facet - static const uint32_t non_character_facet_first = calendar_facet; ///< First character independent facet - static const uint32_t non_character_facet_last = information_facet;///< Last character independent facet - + static const uint32_t non_character_facet_first = calendar_facet; ///< First character independent facet + static const uint32_t non_character_facet_last = information_facet;///< Last character independent facet + static const uint32_t all_categories = 0xFFFFFFFFu; ///< Generate all of them - + typedef uint32_t locale_category_type; ///< a type used for more fine grained generation of facets /// @@ -75,11 +75,11 @@ namespace boost { public: /// - /// Create new generator using global localization_backend_manager + /// Create new generator using global localization_backend_manager /// generator(); /// - /// Create new generator using specific localization_backend_manager + /// Create new generator using specific localization_backend_manager /// generator(localization_backend_manager const &); @@ -93,7 +93,7 @@ namespace boost { /// Get types of facets that should be generated, default all /// locale_category_type categories() const; - + /// /// Set the characters type for which the facets should be generated, default all supported /// @@ -142,13 +142,13 @@ namespace boost { /// /// - Under the Windows platform the path is treated as a path in the locale's encoding so /// if you create locale "en_US.windows-1251" then path would be treated as cp1255, - /// and if it is en_US.UTF-8 it is treated as UTF-8. File name is always opened with + /// and if it is en_US.UTF-8 it is treated as UTF-8. File name is always opened with /// a wide file name as wide file names are the native file name on Windows. /// /// - Under POSIX platforms all paths passed as-is regardless of encoding as narrow /// encodings are the native encodings for POSIX platforms. - /// - /// + /// + /// void add_messages_path(std::string const &path); /// @@ -201,7 +201,7 @@ namespace boost { { return generate(id); } - + /// /// Set backend specific option /// @@ -214,7 +214,7 @@ namespace boost { private: - void set_all_options(std::shared_ptr<localization_backend> backend,std::string const &id) const; + void set_all_options(shared_ptr<localization_backend> backend,std::string const &id) const; generator(generator const &); void operator=(generator const &); @@ -231,5 +231,5 @@ namespace boost { #endif -// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 +// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/communicator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/communicator.hpp index 68b7afea..e450e2a5 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/communicator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/communicator.hpp @@ -16,7 +16,7 @@ #include <boost/mpi/config.hpp> #include <boost/mpi/exception.hpp> #include <boost/optional.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/mpi/datatype.hpp> #include <utility> #include <iterator> @@ -89,7 +89,7 @@ enum comm_create_kind { comm_duplicate, comm_take_ownership, comm_attach }; /** * INTERNAL ONLY - * + * * Forward declaration of @c group needed for the @c group * constructor and accessor. */ @@ -436,7 +436,7 @@ class BOOST_MPI_DECL communicator * @brief Receive an array of values from a remote process. * * This routine blocks until it receives an array of values from the - * process @p source with the given @p tag. If the type @c T is + * process @p source with the given @p tag. If the type @c T is * * @param source The process that will be sending data. This will * either be a process rank within the communicator or the @@ -518,7 +518,7 @@ class BOOST_MPI_DECL communicator * @c skeleton_proxy objects except that @c isend will not block * while waiting for the data to be transmitted. Instead, a request * object will be immediately returned, allowing one to query the - * status of the communication or wait until it has completed. + * status of the communication or wait until it has completed. * * The semantics of this routine are equivalent to a non-blocking * send of a @c packed_skeleton_oarchive storing the skeleton of @@ -628,7 +628,7 @@ class BOOST_MPI_DECL communicator * @brief Initiate receipt of an array of values from a remote process. * * This routine initiates a receive operation for an array of values - * transmitted by process @p source with the given @p tag. + * transmitted by process @p source with the given @p tag. * * @param source The process that will be sending data. This will * either be a process rank within the communicator or the @@ -824,9 +824,9 @@ class BOOST_MPI_DECL communicator #if 0 template<typename Extents> - communicator - with_cartesian_topology(const Extents& extents, - bool periodic = false, + communicator + with_cartesian_topology(const Extents& extents, + bool periodic = false, bool reorder = false) const; template<typename DimInputIterator, typename PeriodicInputIterator> @@ -863,7 +863,7 @@ class BOOST_MPI_DECL communicator * * Function object that frees an MPI communicator and deletes the * memory associated with it. Intended to be used as a deleter with - * std::shared_ptr. + * shared_ptr. */ struct comm_free { @@ -877,7 +877,7 @@ class BOOST_MPI_DECL communicator } }; - + /** * INTERNAL ONLY * @@ -904,7 +904,7 @@ class BOOST_MPI_DECL communicator * datatype, so we map directly to that datatype. */ template<typename T> - void + void array_send_impl(int dest, int tag, const T* values, int n, mpl::true_) const; /** @@ -915,8 +915,8 @@ class BOOST_MPI_DECL communicator * data, to be deserialized on the receiver side. */ template<typename T> - void - array_send_impl(int dest, int tag, const T* values, int n, + void + array_send_impl(int dest, int tag, const T* values, int n, mpl::false_) const; /** @@ -945,8 +945,8 @@ class BOOST_MPI_DECL communicator * datatype, so we map directly to that datatype. */ template<typename T> - request - array_isend_impl(int dest, int tag, const T* values, int n, + request + array_isend_impl(int dest, int tag, const T* values, int n, mpl::true_) const; /** @@ -957,8 +957,8 @@ class BOOST_MPI_DECL communicator * data, to be deserialized on the receiver side. */ template<typename T> - request - array_isend_impl(int dest, int tag, const T* values, int n, + request + array_isend_impl(int dest, int tag, const T* values, int n, mpl::false_) const; /** @@ -987,7 +987,7 @@ class BOOST_MPI_DECL communicator * datatype, so we map directly to that datatype. */ template<typename T> - status + status array_recv_impl(int source, int tag, T* values, int n, mpl::true_) const; /** @@ -998,7 +998,7 @@ class BOOST_MPI_DECL communicator * MPI_PACKED. We'll receive it and then deserialize. */ template<typename T> - status + status array_recv_impl(int source, int tag, T* values, int n, mpl::false_) const; /** @@ -1027,7 +1027,7 @@ class BOOST_MPI_DECL communicator * map directly to that datatype. */ template<typename T> - request + request array_irecv_impl(int source, int tag, T* values, int n, mpl::true_) const; /** @@ -1038,10 +1038,10 @@ class BOOST_MPI_DECL communicator * MPI_PACKED. We'll receive it and then deserialize. */ template<typename T> - request + request array_irecv_impl(int source, int tag, T* values, int n, mpl::false_) const; - std::shared_ptr<MPI_Comm> comm_ptr; + shared_ptr<MPI_Comm> comm_ptr; }; /** @@ -1070,13 +1070,13 @@ inline bool operator!=(const communicator& comm1, const communicator& comm2) * Implementation details * ************************************************************************/ // Count elements in a message -template<typename T> +template<typename T> inline optional<int> status::count() const { return count_impl<T>(is_mpi_datatype<T>()); } -template<typename T> +template<typename T> optional<int> status::count_impl(mpl::true_) const { if (m_count != -1) @@ -1092,7 +1092,7 @@ optional<int> status::count_impl(mpl::true_) const return m_count = return_value; } -template<typename T> +template<typename T> inline optional<int> status::count_impl(mpl::false_) const { if (m_count == -1) @@ -1140,7 +1140,7 @@ communicator::array_send_impl(int dest, int tag, const T* values, int n, mpl::true_) const { BOOST_MPI_CHECK_RESULT(MPI_Send, - (const_cast<T*>(values), n, + (const_cast<T*>(values), n, get_mpi_datatype<T>(*values), dest, tag, MPI_Comm(*this))); } @@ -1173,7 +1173,7 @@ status communicator::recv_impl(int source, int tag, T& value, mpl::true_) const status stat; BOOST_MPI_CHECK_RESULT(MPI_Recv, - (const_cast<T*>(&value), 1, + (const_cast<T*>(&value), 1, get_mpi_datatype<T>(value), source, tag, MPI_Comm(*this), &stat.m_status)); return stat; @@ -1202,13 +1202,13 @@ status communicator::recv(int source, int tag, T& value) const } template<typename T> -status -communicator::array_recv_impl(int source, int tag, T* values, int n, +status +communicator::array_recv_impl(int source, int tag, T* values, int n, mpl::true_) const { status stat; BOOST_MPI_CHECK_RESULT(MPI_Recv, - (const_cast<T*>(values), n, + (const_cast<T*>(values), n, get_mpi_datatype<T>(*values), source, tag, MPI_Comm(*this), &stat.m_status)); return stat; @@ -1216,7 +1216,7 @@ communicator::array_recv_impl(int source, int tag, T* values, int n, template<typename T> status -communicator::array_recv_impl(int source, int tag, T* values, int n, +communicator::array_recv_impl(int source, int tag, T* values, int n, mpl::false_) const { // Receive the message @@ -1255,7 +1255,7 @@ communicator::isend_impl(int dest, int tag, const T& value, mpl::true_) const { request req; BOOST_MPI_CHECK_RESULT(MPI_Isend, - (const_cast<T*>(&value), 1, + (const_cast<T*>(&value), 1, get_mpi_datatype<T>(value), dest, tag, MPI_Comm(*this), &req.m_requests[0])); return req; @@ -1268,7 +1268,7 @@ template<typename T> request communicator::isend_impl(int dest, int tag, const T& value, mpl::false_) const { - std::shared_ptr<packed_oarchive> archive(new packed_oarchive(*this)); + shared_ptr<packed_oarchive> archive(new packed_oarchive(*this)); *archive << value; request result = isend(dest, tag, *archive); result.m_data = archive; @@ -1290,7 +1290,7 @@ communicator::array_isend_impl(int dest, int tag, const T* values, int n, { request req; BOOST_MPI_CHECK_RESULT(MPI_Isend, - (const_cast<T*>(values), n, + (const_cast<T*>(values), n, get_mpi_datatype<T>(*values), dest, tag, MPI_Comm(*this), &req.m_requests[0])); return req; @@ -1298,10 +1298,10 @@ communicator::array_isend_impl(int dest, int tag, const T* values, int n, template<typename T> request -communicator::array_isend_impl(int dest, int tag, const T* values, int n, +communicator::array_isend_impl(int dest, int tag, const T* values, int n, mpl::false_) const { - std::shared_ptr<packed_oarchive> archive(new packed_oarchive(*this)); + shared_ptr<packed_oarchive> archive(new packed_oarchive(*this)); *archive << n << boost::serialization::make_array(values, n); request result = isend(dest, tag, *archive); result.m_data = archive; @@ -1324,15 +1324,15 @@ namespace detail { template<typename T> struct serialized_irecv_data { - serialized_irecv_data(const communicator& comm, int source, int tag, + serialized_irecv_data(const communicator& comm, int source, int tag, T& value) - : comm(comm), source(source), tag(tag), ia(comm), value(value) - { + : comm(comm), source(source), tag(tag), ia(comm), value(value) + { } - void deserialize(status& stat) - { - ia >> value; + void deserialize(status& stat) + { + ia >> value; stat.m_count = 1; } @@ -1347,7 +1347,7 @@ namespace detail { template<> struct serialized_irecv_data<packed_iarchive> { - serialized_irecv_data(const communicator& comm, int source, int tag, + serialized_irecv_data(const communicator& comm, int source, int tag, packed_iarchive& ia) : comm(comm), source(source), tag(tag), ia(ia) { } @@ -1367,10 +1367,10 @@ namespace detail { template<typename T> struct serialized_array_irecv_data { - serialized_array_irecv_data(const communicator& comm, int source, int tag, + serialized_array_irecv_data(const communicator& comm, int source, int tag, T* values, int n) : comm(comm), source(source), tag(tag), ia(comm), values(values), n(n) - { + { } void deserialize(status& stat); @@ -1390,26 +1390,26 @@ namespace detail { // Determine how much data we are going to receive int count; ia >> count; - + // Deserialize the data in the message boost::serialization::array<T> arr(values, count > n? n : count); ia >> arr; - + if (count > n) { boost::throw_exception( std::range_error("communicator::recv: message receive overflow")); } - + stat.m_count = count; } } template<typename T> -optional<status> +optional<status> request::handle_serialized_irecv(request* self, request_action action) { typedef detail::serialized_irecv_data<T> data_t; - std::shared_ptr<data_t> data = static_pointer_cast<data_t>(self->m_data); + shared_ptr<data_t> data = static_pointer_cast<data_t>(self->m_data); if (action == ra_wait) { status stat; @@ -1421,7 +1421,7 @@ request::handle_serialized_irecv(request* self, request_action action) data->ia.resize(data->count); BOOST_MPI_CHECK_RESULT(MPI_Irecv, (data->ia.address(), data->ia.size(), MPI_PACKED, - stat.source(), stat.tag(), + stat.source(), stat.tag(), MPI_Comm(data->comm), self->m_requests + 1)); } @@ -1444,11 +1444,11 @@ request::handle_serialized_irecv(request* self, request_action action) data->ia.resize(data->count); BOOST_MPI_CHECK_RESULT(MPI_Irecv, (data->ia.address(), data->ia.size(),MPI_PACKED, - stat.source(), stat.tag(), + stat.source(), stat.tag(), MPI_Comm(data->comm), self->m_requests + 1)); } else return optional<status>(); // We have not finished yet - } + } // Check if we have received the message data BOOST_MPI_CHECK_RESULT(MPI_Test, @@ -1456,7 +1456,7 @@ request::handle_serialized_irecv(request* self, request_action action) if (flag) { data->deserialize(stat); return stat; - } else + } else return optional<status>(); } else { return optional<status>(); @@ -1464,11 +1464,11 @@ request::handle_serialized_irecv(request* self, request_action action) } template<typename T> -optional<status> +optional<status> request::handle_serialized_array_irecv(request* self, request_action action) { typedef detail::serialized_array_irecv_data<T> data_t; - std::shared_ptr<data_t> data = static_pointer_cast<data_t>(self->m_data); + shared_ptr<data_t> data = static_pointer_cast<data_t>(self->m_data); if (action == ra_wait) { status stat; @@ -1480,7 +1480,7 @@ request::handle_serialized_array_irecv(request* self, request_action action) data->ia.resize(data->count); BOOST_MPI_CHECK_RESULT(MPI_Irecv, (data->ia.address(), data->ia.size(), MPI_PACKED, - stat.source(), stat.tag(), + stat.source(), stat.tag(), MPI_Comm(data->comm), self->m_requests + 1)); } @@ -1503,11 +1503,11 @@ request::handle_serialized_array_irecv(request* self, request_action action) data->ia.resize(data->count); BOOST_MPI_CHECK_RESULT(MPI_Irecv, (data->ia.address(), data->ia.size(),MPI_PACKED, - stat.source(), stat.tag(), + stat.source(), stat.tag(), MPI_Comm(data->comm), self->m_requests + 1)); } else return optional<status>(); // We have not finished yet - } + } // Check if we have received the message data BOOST_MPI_CHECK_RESULT(MPI_Test, @@ -1515,7 +1515,7 @@ request::handle_serialized_array_irecv(request* self, request_action action) if (flag) { data->deserialize(stat); return stat; - } else + } else return optional<status>(); } else { return optional<status>(); @@ -1525,12 +1525,12 @@ request::handle_serialized_array_irecv(request* self, request_action action) // We're receiving a type that has an associated MPI datatype, so we // map directly to that datatype. template<typename T> -request +request communicator::irecv_impl(int source, int tag, T& value, mpl::true_) const { request req; BOOST_MPI_CHECK_RESULT(MPI_Irecv, - (const_cast<T*>(&value), 1, + (const_cast<T*>(&value), 1, get_mpi_datatype<T>(value), source, tag, MPI_Comm(*this), &req.m_requests[0])); return req; @@ -1541,34 +1541,34 @@ request communicator::irecv_impl(int source, int tag, T& value, mpl::false_) const { typedef detail::serialized_irecv_data<T> data_t; - std::shared_ptr<data_t> data(new data_t(*this, source, tag, value)); + shared_ptr<data_t> data(new data_t(*this, source, tag, value)); request req; req.m_data = data; req.m_handler = request::handle_serialized_irecv<T>; BOOST_MPI_CHECK_RESULT(MPI_Irecv, - (&data->count, 1, + (&data->count, 1, get_mpi_datatype<std::size_t>(data->count), source, tag, MPI_Comm(*this), &req.m_requests[0])); - + return req; } template<typename T> -request +request communicator::irecv(int source, int tag, T& value) const { return this->irecv_impl(source, tag, value, is_mpi_datatype<T>()); } template<typename T> -request -communicator::array_irecv_impl(int source, int tag, T* values, int n, +request +communicator::array_irecv_impl(int source, int tag, T* values, int n, mpl::true_) const { request req; BOOST_MPI_CHECK_RESULT(MPI_Irecv, - (const_cast<T*>(values), n, + (const_cast<T*>(values), n, get_mpi_datatype<T>(*values), source, tag, MPI_Comm(*this), &req.m_requests[0])); return req; @@ -1576,17 +1576,17 @@ communicator::array_irecv_impl(int source, int tag, T* values, int n, template<typename T> request -communicator::array_irecv_impl(int source, int tag, T* values, int n, +communicator::array_irecv_impl(int source, int tag, T* values, int n, mpl::false_) const { typedef detail::serialized_array_irecv_data<T> data_t; - std::shared_ptr<data_t> data(new data_t(*this, source, tag, values, n)); + shared_ptr<data_t> data(new data_t(*this, source, tag, values, n)); request req; req.m_data = data; req.m_handler = request::handle_serialized_array_irecv<T>; BOOST_MPI_CHECK_RESULT(MPI_Irecv, - (&data->count, 1, + (&data->count, 1, get_mpi_datatype<std::size_t>(data->count), source, tag, MPI_Comm(*this), &req.m_requests[0])); @@ -1657,7 +1657,7 @@ communicator::recv<content>(int source, int tag, content& c) const { return recv<const content>(source,tag,c); -} +} /** * INTERNAL ONLY diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/detail/communicator_sc.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/detail/communicator_sc.hpp index 1102675f..1dfcc3c5 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/detail/communicator_sc.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/detail/communicator_sc.hpp @@ -45,7 +45,7 @@ template<typename T> request communicator::isend(int dest, int tag, const skeleton_proxy<T>& proxy) const { - std::shared_ptr<packed_skeleton_oarchive> + shared_ptr<packed_skeleton_oarchive> archive(new packed_skeleton_oarchive(*this)); *archive << proxy.object; @@ -58,13 +58,13 @@ namespace detail { template<typename T> struct serialized_irecv_data<const skeleton_proxy<T> > { - serialized_irecv_data(const communicator& comm, int source, int tag, + serialized_irecv_data(const communicator& comm, int source, int tag, skeleton_proxy<T> proxy) - : comm(comm), source(source), tag(tag), isa(comm), + : comm(comm), source(source), tag(tag), isa(comm), ia(isa.get_skeleton()), proxy(proxy) { } - void deserialize(status& stat) - { + void deserialize(status& stat) + { isa >> proxy.object; stat.m_count = 1; } @@ -84,7 +84,7 @@ namespace detail { { typedef serialized_irecv_data<const skeleton_proxy<T> > inherited; - serialized_irecv_data(const communicator& comm, int source, int tag, + serialized_irecv_data(const communicator& comm, int source, int tag, const skeleton_proxy<T>& proxy) : inherited(comm, source, tag, proxy) { } }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/graph_communicator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/graph_communicator.hpp index f9747c77..6cafb1fe 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/graph_communicator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/graph_communicator.hpp @@ -59,7 +59,7 @@ class BOOST_MPI_DECL graph_communicator : public communicator * underlying MPI_Comm. This operation is used for "casting" from a * communicator to a graph communicator. */ - explicit graph_communicator(const std::shared_ptr<MPI_Comm>& comm_ptr) + explicit graph_communicator(const shared_ptr<MPI_Comm>& comm_ptr) { #ifndef BOOST_DISABLE_ASSERTS int status; @@ -99,7 +99,7 @@ public: */ graph_communicator(const MPI_Comm& comm, comm_create_kind kind) : communicator(comm, kind) - { + { #ifndef BOOST_DISABLE_ASSERTS int status; BOOST_MPI_CHECK_RESULT(MPI_Topo_test, ((MPI_Comm)*this, &status)); @@ -116,8 +116,8 @@ public: * resulting communicator will be a NULL communicator. * * @param comm The communicator that the new, graph communicator - * will be based on. - * + * will be based on. + * * @param graph Any type that meets the requirements of the * Incidence Graph and Vertex List Graph concepts from the Boost Graph * Library. This structure of this graph will become the topology @@ -130,8 +130,8 @@ public: * within the original communicator. */ template<typename Graph> - explicit - graph_communicator(const communicator& comm, const Graph& graph, + explicit + graph_communicator(const communicator& comm, const Graph& graph, bool reorder = false); /** @@ -145,7 +145,7 @@ public: * @param comm The communicator that the new, graph communicator * will be based on. The ranks in @c rank refer to the processes in * this communicator. - * + * * @param graph Any type that meets the requirements of the * Incidence Graph and Vertex List Graph concepts from the Boost Graph * Library. This structure of this graph will become the topology @@ -164,8 +164,8 @@ public: * within the original communicator. */ template<typename Graph, typename RankMap> - explicit - graph_communicator(const communicator& comm, const Graph& graph, + explicit + graph_communicator(const communicator& comm, const Graph& graph, RankMap rank, bool reorder = false); protected: @@ -177,7 +177,7 @@ protected: */ template<typename Graph, typename RankMap> void - setup_graph(const communicator& comm, const Graph& graph, RankMap rank, + setup_graph(const communicator& comm, const Graph& graph, RankMap rank, bool reorder); }; @@ -186,16 +186,16 @@ protected: ****************************************************************************/ template<typename Graph> -graph_communicator::graph_communicator(const communicator& comm, - const Graph& graph, +graph_communicator::graph_communicator(const communicator& comm, + const Graph& graph, bool reorder) { this->setup_graph(comm, graph, get(vertex_index, graph), reorder); } template<typename Graph, typename RankMap> -graph_communicator::graph_communicator(const communicator& comm, - const Graph& graph, +graph_communicator::graph_communicator(const communicator& comm, + const Graph& graph, RankMap rank, bool reorder) { this->setup_graph(comm, graph, rank, reorder); @@ -204,7 +204,7 @@ graph_communicator::graph_communicator(const communicator& comm, template<typename Graph, typename RankMap> void -graph_communicator::setup_graph(const communicator& comm, const Graph& graph, +graph_communicator::setup_graph(const communicator& comm, const Graph& graph, RankMap rank, bool reorder) { typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor; @@ -234,7 +234,7 @@ graph_communicator::setup_graph(const communicator& comm, const Graph& graph, // Create the new communicator MPI_Comm newcomm; BOOST_MPI_CHECK_RESULT(MPI_Graph_create, - ((MPI_Comm)comm, + ((MPI_Comm)comm, nvertices, &indices[0], edges.empty()? (int*)0 : &edges[0], @@ -254,10 +254,10 @@ namespace detail { * communicator's graph topology. */ class comm_out_edge_iterator - : public iterator_facade<comm_out_edge_iterator, + : public iterator_facade<comm_out_edge_iterator, std::pair<int, int>, random_access_traversal_tag, - const std::pair<int, int>&, + const std::pair<int, int>&, int> { public: @@ -304,10 +304,10 @@ namespace detail { * communicator's graph topology. */ class comm_adj_iterator - : public iterator_facade<comm_adj_iterator, + : public iterator_facade<comm_adj_iterator, int, random_access_traversal_tag, - int, + int, int> { public: @@ -349,10 +349,10 @@ namespace detail { * topology. */ class comm_edge_iterator - : public iterator_facade<comm_edge_iterator, + : public iterator_facade<comm_edge_iterator, std::pair<int, int>, forward_traversal_tag, - const std::pair<int, int>&, + const std::pair<int, int>&, int> { public: @@ -381,9 +381,9 @@ namespace detail { return edge_index == other.edge_index; } - void increment() - { - ++edge_index; + void increment() + { + ++edge_index; } shared_array<int> indices; @@ -478,7 +478,7 @@ int num_edges(const graph_communicator& comm); /** * @brief Returns a property map that maps from vertices in a - * communicator's graph topology to their index values. + * communicator's graph topology to their index values. * * Since the vertices are ranks in the communicator, the returned * property map is the identity property map. @@ -522,16 +522,16 @@ struct graph_traits<mpi::graph_communicator> { typedef std::pair<int, int> edge_descriptor; typedef directed_tag directed_category; typedef disallow_parallel_edge_tag edge_parallel_category; - + /** * INTERNAL ONLY */ struct traversal_category - : incidence_graph_tag, - adjacency_graph_tag, - vertex_list_graph_tag, - edge_list_graph_tag - { + : incidence_graph_tag, + adjacency_graph_tag, + vertex_list_graph_tag, + edge_list_graph_tag + { }; /** diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/group.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/group.hpp index 5fa5e4b5..103b35a1 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/group.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/group.hpp @@ -16,7 +16,7 @@ #define BOOST_MPI_GROUP_HPP #include <boost/mpi/exception.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/optional.hpp> #include <vector> @@ -62,7 +62,7 @@ public: /** * @brief Determine the rank of the calling process in the group. - * + * * This routine is equivalent to @c MPI_Group_rank. * * @returns The rank of the calling process in the group, which will @@ -167,11 +167,11 @@ public: * * @returns A new group containing all of the processes in the * current group except those processes with ranks @c [first, last) - * in the current group. + * in the current group. */ template<typename InputIterator> group exclude(InputIterator first, InputIterator last); - + protected: /** @@ -179,7 +179,7 @@ protected: * * Function object that frees an MPI group and deletes the * memory associated with it. Intended to be used as a deleter with - * std::shared_ptr. + * shared_ptr. */ struct group_free { @@ -199,7 +199,7 @@ protected: * @c group class. When there are no more such instances, the group * will be automatically freed. */ - std::shared_ptr<MPI_Group> group_ptr; + shared_ptr<MPI_Group> group_ptr; }; /** @@ -223,7 +223,7 @@ BOOST_MPI_DECL bool operator==(const group& g1, const group& g2); * processes in the same order. */ inline bool operator!=(const group& g1, const group& g2) -{ +{ return !(g1 == g2); } @@ -260,7 +260,7 @@ BOOST_MPI_DECL group operator-(const group& g1, const group& g2); * Implementation details * ************************************************************************/ template<typename InputIterator, typename OutputIterator> -OutputIterator +OutputIterator group::translate_ranks(InputIterator first, InputIterator last, const group& to_group, OutputIterator out) { @@ -283,11 +283,11 @@ group::translate_ranks(InputIterator first, InputIterator last, /** * INTERNAL ONLY - * + * * Specialization of translate_ranks that handles the one case where * we can avoid any memory allocation or copying. */ -template<> +template<> BOOST_MPI_DECL int* group::translate_ranks(int* first, int* last, const group& to_group, int* out); @@ -306,7 +306,7 @@ group group::include(InputIterator first, InputIterator last) /** * INTERNAL ONLY - * + * * Specialization of group::include that handles the one case where we * can avoid any memory allocation or copying before creating the * group. @@ -328,7 +328,7 @@ group group::exclude(InputIterator first, InputIterator last) /** * INTERNAL ONLY - * + * * Specialization of group::exclude that handles the one case where we * can avoid any memory allocation or copying before creating the * group. diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/intercommunicator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/intercommunicator.hpp index d57c79e2..ad246b59 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/intercommunicator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/intercommunicator.hpp @@ -24,7 +24,7 @@ namespace boost { namespace mpi { * * Forward declaration of the MPI "group" representation, for use in * the description of the @c intercommunicator class. - */ + */ class group; /** @@ -45,8 +45,8 @@ class group; * intercommunicators occurs between the processes in the local group * and the processes in the remote group; communication within a group * must use a different (intra-)communicator. - * - */ + * + */ class BOOST_MPI_DECL intercommunicator : public communicator { private: @@ -59,7 +59,7 @@ private: * underlying MPI_Comm. This operation is used for "casting" from a * communicator to an intercommunicator. */ - explicit intercommunicator(const std::shared_ptr<MPI_Comm>& cp) + explicit intercommunicator(const shared_ptr<MPI_Comm>& cp) { this->comm_ptr = cp; } @@ -149,7 +149,7 @@ public: * Merge the local and remote groups in this intercommunicator into * a new intracommunicator containing the union of the processes in * both groups. This method is equivalent to @c MPI_Intercomm_merge. - * + * * @param high Whether the processes in this group should have the * higher rank numbers than the processes in the other group. Each * of the processes within a particular group shall have the same diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/request.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/request.hpp index e43f00a8..cb36cc5a 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/request.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/request.hpp @@ -14,7 +14,7 @@ #include <boost/mpi/config.hpp> #include <boost/optional.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/mpi/packed_iarchive.hpp> namespace boost { namespace mpi { @@ -29,7 +29,7 @@ class communicator; * receive and will be returned from @c isend or @c irecv, * respectively. */ -class BOOST_MPI_DECL request +class BOOST_MPI_DECL request { public: /** @@ -62,7 +62,7 @@ class BOOST_MPI_DECL request private: enum request_action { ra_wait, ra_test, ra_cancel }; - typedef optional<status> (*handler_type)(request* self, + typedef optional<status> (*handler_type)(request* self, request_action action); /** @@ -71,7 +71,7 @@ class BOOST_MPI_DECL request * Handles the non-blocking receive of a serialized value. */ template<typename T> - static optional<status> + static optional<status> handle_serialized_irecv(request* self, request_action action); /** @@ -80,7 +80,7 @@ class BOOST_MPI_DECL request * Handles the non-blocking receive of an array of serialized values. */ template<typename T> - static optional<status> + static optional<status> handle_serialized_array_irecv(request* self, request_action action); public: // template friends are not portable @@ -92,7 +92,7 @@ class BOOST_MPI_DECL request handler_type m_handler; /// INTERNAL ONLY - std::shared_ptr<void> m_data; + shared_ptr<void> m_data; friend class communicator; }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/skeleton_and_content.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/skeleton_and_content.hpp index 78c5fb27..dcd13bfe 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/skeleton_and_content.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/mpi/skeleton_and_content.hpp @@ -31,7 +31,7 @@ #include <boost/mpi/detail/forward_skeleton_oarchive.hpp> #include <boost/mpi/detail/ignore_iprimitive.hpp> #include <boost/mpi/detail/ignore_oprimitive.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/archive/detail/register_archive.hpp> namespace boost { namespace mpi { @@ -197,7 +197,7 @@ public: } private: - boost::std::shared_ptr<detail::mpi_datatype_holder> holder; + boost::shared_ptr<detail::mpi_datatype_holder> holder; }; /** @brief Returns the content of an object, suitable for transmission diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/pointee.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/pointee.hpp index d4d24f49..9794b8e7 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/pointee.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/pointee.hpp @@ -8,7 +8,7 @@ // // typename pointee<P>::type provides the pointee type of P. // -// For example, it is T for T* and X for std::shared_ptr<X>. +// For example, it is T for T* and X for shared_ptr<X>. // // http://www.boost.org/libs/iterator/doc/pointee.html // @@ -20,7 +20,7 @@ # include <boost/mpl/if.hpp> # include <boost/mpl/eval_if.hpp> -namespace boost { +namespace boost { namespace detail { @@ -34,25 +34,25 @@ namespace detail struct iterator_pointee { typedef typename iterator_traits<Iterator>::value_type value_type; - + struct impl { template <class T> static char test(T const&); - + static char (& test(value_type&) )[2]; - + static Iterator& x; }; - + BOOST_STATIC_CONSTANT(bool, is_constant = sizeof(impl::test(*impl::x)) == 1); - + typedef typename mpl::if_c< # if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551)) ::boost::detail::iterator_pointee<Iterator>::is_constant # else is_constant -# endif +# endif , typename add_const<value_type>::type , value_type >::type type; @@ -68,7 +68,7 @@ struct pointee > { }; - + } // namespace boost #endif // POINTEE_DWA200415_HPP diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/program_options/detail/config_file.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/program_options/detail/config_file.hpp index 0aa83ba1..4c2c15b9 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/program_options/detail/config_file.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/program_options/detail/config_file.hpp @@ -25,7 +25,7 @@ #include <boost/static_assert.hpp> #include <boost/type_traits/is_same.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> @@ -38,7 +38,7 @@ namespace boost { namespace program_options { namespace detail { for(; i !=e; ++i) { *i; } - + Syntax conventions: - config file can not contain positional options @@ -47,10 +47,10 @@ namespace boost { namespace program_options { namespace detail { - variable assignments are in the form name '=' value. spaces around '=' are trimmed. - - Section names are given in brackets. + - Section names are given in brackets. The actual option name is constructed by combining current section - name and specified option name, with dot between. If section_name + name and specified option name, with dot between. If section_name already contains dot at the end, new dot is not inserted. For example: @verbatim [gui.accessibility] @@ -61,8 +61,8 @@ namespace boost { namespace program_options { namespace detail { TODO: maybe, we should just accept a pointer to options_description class. - */ - class common_config_file_iterator + */ + class common_config_file_iterator : public eof_iterator<common_config_file_iterator, option> { public: @@ -74,9 +74,9 @@ namespace boost { namespace program_options { namespace detail { virtual ~common_config_file_iterator() {} public: // Method required by eof_iterator - + void get(); - + protected: // Stubs for derived classes // Obtains next line from the config file @@ -85,7 +85,7 @@ namespace boost { namespace program_options { namespace detail { // constructor of this class, but to avoid templating this class // we'd need polymorphic iterator, which does not exist yet. virtual bool getline(std::string&) { return false; } - + private: /** Adds another allowed option. If the 'name' ends with '*', then all options with the same prefix are @@ -94,7 +94,7 @@ namespace boost { namespace program_options { namespace detail { void add_option(const char* name); // Returns true if 's' is a registered option name. - bool allowed_option(const std::string& s) const; + bool allowed_option(const std::string& s) const; // That's probably too much data for iterator, since // it will be copied, but let's not bother for now. @@ -113,20 +113,20 @@ namespace boost { namespace program_options { namespace detail { found_eof(); } - /** Creates a config file parser for the specified stream. + /** Creates a config file parser for the specified stream. */ - basic_config_file_iterator(std::basic_istream<charT>& is, + basic_config_file_iterator(std::basic_istream<charT>& is, const std::set<std::string>& allowed_options, - bool allow_unregistered = false); + bool allow_unregistered = false); private: // base overrides bool getline(std::string&); private: // internal data - std::shared_ptr<std::basic_istream<charT> > is; + shared_ptr<std::basic_istream<charT> > is; }; - + typedef basic_config_file_iterator<char> config_file_iterator; typedef basic_config_file_iterator<wchar_t> wconfig_file_iterator; @@ -139,12 +139,12 @@ namespace boost { namespace program_options { namespace detail { template<class charT> basic_config_file_iterator<charT>:: - basic_config_file_iterator(std::basic_istream<charT>& is, + basic_config_file_iterator(std::basic_istream<charT>& is, const std::set<std::string>& allowed_options, bool allow_unregistered) : common_config_file_iterator(allowed_options, allow_unregistered) { - this->is.reset(&is, null_deleter()); + this->is.reset(&is, null_deleter()); get(); } @@ -173,7 +173,7 @@ namespace boost { namespace program_options { namespace detail { basic_config_file_iterator<wchar_t>::getline(std::string& s); #endif - + }}} diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/program_options/options_description.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/program_options/options_description.hpp index 2b5dee37..62530b2d 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/program_options/options_description.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/program_options/options_description.hpp @@ -13,7 +13,7 @@ #include <boost/program_options/value_semantic.hpp> #include <boost/function.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/detail/workaround.hpp> #include <boost/any.hpp> @@ -27,12 +27,12 @@ #if defined(BOOST_MSVC) # pragma warning (push) -# pragma warning (disable:4251) // class 'boost::std::shared_ptr<T>' needs to have dll-interface to be used by clients of class 'boost::program_options::option_description' +# pragma warning (disable:4251) // class 'boost::shared_ptr<T>' needs to have dll-interface to be used by clients of class 'boost::program_options::option_description' #endif /** Boost namespace */ -namespace boost { +namespace boost { /** Namespace for the library. */ namespace program_options { @@ -67,7 +67,7 @@ namespace program_options { So, we have to use plain old pointers. Besides, users are not expected to use the constructor directly. - + The 'name' parameter is interpreted by the following rules: - if there's no "," character in 'name', it specifies long name - otherwise, the part before "," specifies long name and the part @@ -76,7 +76,7 @@ namespace program_options { option_description(const char* name, const value_semantic* s); - /** Initializes the class with the passed data. + /** Initializes the class with the passed data. */ option_description(const char* name, const value_semantic* s, @@ -118,9 +118,9 @@ namespace program_options { const std::string& description() const; /// Semantic of option's value - std::shared_ptr<const value_semantic> semantic() const; - - /// Returns the option name, formatted suitably for usage message. + shared_ptr<const value_semantic> semantic() const; + + /// Returns the option name, formatted suitably for usage message. std::string format_name() const; /** Returns the parameter name and properties, formatted suitably for @@ -128,19 +128,19 @@ namespace program_options { std::string format_parameter() const; private: - + option_description& set_name(const char* name); std::string m_short_name, m_long_name, m_description; - // std::shared_ptr is needed to simplify memory management in + // shared_ptr is needed to simplify memory management in // copy ctor and destructor. - std::shared_ptr<const value_semantic> m_value_semantic; + shared_ptr<const value_semantic> m_value_semantic; }; class options_description; - /** Class which provides convenient creation syntax to option_description. - */ + /** Class which provides convenient creation syntax to option_description. + */ class BOOST_PROGRAM_OPTIONS_DECL options_description_easy_init { public: options_description_easy_init(options_description* owner); @@ -152,12 +152,12 @@ namespace program_options { options_description_easy_init& operator()(const char* name, const value_semantic* s); - + options_description_easy_init& operator()(const char* name, const value_semantic* s, const char* description); - + private: options_description* owner; }; @@ -166,14 +166,14 @@ namespace program_options { /** A set of option descriptions. This provides convenient interface for adding new option (the add_options) method, and facilities to search for options by name. - + See @ref a_adding_options "here" for option adding interface discussion. @sa option_description */ class BOOST_PROGRAM_OPTIONS_DECL options_description { public: static const unsigned m_default_line_length; - + /** Creates the instance. */ options_description(unsigned line_length = m_default_line_length, unsigned min_description_length = m_default_line_length / 2); @@ -188,11 +188,11 @@ namespace program_options { unsigned line_length = m_default_line_length, unsigned min_description_length = m_default_line_length / 2); /** Adds new variable description. Throws duplicate_variable_error if - either short or long name matches that of already present one. + either short or long name matches that of already present one. */ - void add(std::shared_ptr<option_description> desc); + void add(shared_ptr<option_description> desc); /** Adds a group of option description. This has the same - effect as adding all option_descriptions in 'desc' + effect as adding all option_descriptions in 'desc' individually, except that output operator will show a separate group. Returns *this. @@ -202,29 +202,29 @@ namespace program_options { public: /** Returns an object of implementation-defined type suitable for adding options to options_description. The returned object will - have overloaded operator() with parameter type matching + have overloaded operator() with parameter type matching 'option_description' constructors. Calling the operator will create new option_description instance and add it. */ options_description_easy_init add_options(); - const option_description& find(const std::string& name, - bool approx, + const option_description& find(const std::string& name, + bool approx, bool long_ignore_case = false, bool short_ignore_case = false) const; - const option_description* find_nothrow(const std::string& name, + const option_description* find_nothrow(const std::string& name, bool approx, bool long_ignore_case = false, bool short_ignore_case = false) const; - const std::vector< std::shared_ptr<option_description> >& options() const; + const std::vector< shared_ptr<option_description> >& options() const; /** Produces a human readable output of 'desc', listing options, their descriptions and allowed parameters. Other options_description instances previously passed to add will be output separately. */ - friend BOOST_PROGRAM_OPTIONS_DECL std::ostream& operator<<(std::ostream& os, + friend BOOST_PROGRAM_OPTIONS_DECL std::ostream& operator<<(std::ostream& os, const options_description& desc); /** Outputs 'desc' to the specified stream, calling 'f' to output each @@ -233,7 +233,7 @@ namespace program_options { private: typedef std::map<std::string, int>::const_iterator name2index_iterator; - typedef std::pair<name2index_iterator, name2index_iterator> + typedef std::pair<name2index_iterator, name2index_iterator> approximation_range; //approximation_range find_approximation(const std::string& prefix) const; @@ -241,11 +241,11 @@ namespace program_options { std::string m_caption; const unsigned m_line_length; const unsigned m_min_description_length; - + // Data organization is chosen because: // - there could be two names for one option // - option_add_proxy needs to know the last added option - std::vector< std::shared_ptr<option_description> > m_options; + std::vector< shared_ptr<option_description> > m_options; // Whether the option comes from one of declared groups. #if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, BOOST_TESTED_AT(313)) @@ -256,7 +256,7 @@ namespace program_options { std::vector<bool> belong_to_group; #endif - std::vector< std::shared_ptr<options_description> > groups; + std::vector< shared_ptr<options_description> > groups; }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/program_options/variables_map.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/program_options/variables_map.hpp index 47811f78..be0a4b64 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/program_options/variables_map.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/program_options/variables_map.hpp @@ -10,7 +10,7 @@ #include <boost/program_options/config.hpp> #include <boost/any.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <string> #include <map> @@ -31,35 +31,35 @@ namespace boost { namespace program_options { // forward declaration - /** Stores in 'm' all options that are defined in 'options'. + /** Stores in 'm' all options that are defined in 'options'. If 'm' already has a non-defaulted value of an option, that value - is not changed, even if 'options' specify some value. + is not changed, even if 'options' specify some value. */ - BOOST_PROGRAM_OPTIONS_DECL + BOOST_PROGRAM_OPTIONS_DECL void store(const basic_parsed_options<char>& options, variables_map& m, bool utf8 = false); - /** Stores in 'm' all options that are defined in 'options'. + /** Stores in 'm' all options that are defined in 'options'. If 'm' already has a non-defaulted value of an option, that value - is not changed, even if 'options' specify some value. + is not changed, even if 'options' specify some value. This is wide character variant. */ - BOOST_PROGRAM_OPTIONS_DECL - void store(const basic_parsed_options<wchar_t>& options, + BOOST_PROGRAM_OPTIONS_DECL + void store(const basic_parsed_options<wchar_t>& options, variables_map& m); /** Runs all 'notify' function for options in 'm'. */ BOOST_PROGRAM_OPTIONS_DECL void notify(variables_map& m); - /** Class holding value of option. Contains details about how the + /** Class holding value of option. Contains details about how the value is set and allows to conveniently obtain the value. */ class BOOST_PROGRAM_OPTIONS_DECL variable_value { public: variable_value() : m_defaulted(false) {} - variable_value(const boost::any& xv, bool xdefaulted) - : v(xv), m_defaulted(xdefaulted) + variable_value(const boost::any& xv, bool xdefaulted) + : v(xv), m_defaulted(xdefaulted) {} /** If stored value if of type T, returns that value. Otherwise, @@ -92,10 +92,10 @@ namespace boost { namespace program_options { // they are known only after all sources are stored. By that // time options_description for the first source might not // be easily accessible, so we need to store semantic here. - std::shared_ptr<const value_semantic> m_value_semantic; + shared_ptr<const value_semantic> m_value_semantic; friend BOOST_PROGRAM_OPTIONS_DECL - void store(const basic_parsed_options<char>& options, + void store(const basic_parsed_options<char>& options, variables_map& m, bool); friend BOOST_PROGRAM_OPTIONS_DECL class variables_map; @@ -138,8 +138,8 @@ namespace boost { namespace program_options { const abstract_variables_map* m_next; }; - /** Concrete variables map which store variables in real map. - + /** Concrete variables map which store variables in real map. + This class is derived from std::map<std::string, variable_value>, so you can use all map operators to examine its content. */ @@ -155,8 +155,8 @@ namespace boost { namespace program_options { { return abstract_variables_map::operator[](name); } // Override to clear some extra fields. - void clear(); - + void clear(); + void notify(); private: @@ -169,10 +169,10 @@ namespace boost { namespace program_options { std::set<std::string> m_final; friend BOOST_PROGRAM_OPTIONS_DECL - void store(const basic_parsed_options<char>& options, + void store(const basic_parsed_options<char>& options, variables_map& xm, bool utf8); - + /** Names of required options, filled by parser which has access to options_description. The map values are the "canonical" names for each corresponding option. diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/dynamic_property_map.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/dynamic_property_map.hpp index e470ad0e..f5f4230e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/dynamic_property_map.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/dynamic_property_map.hpp @@ -206,9 +206,9 @@ private: // struct dynamic_properties { - typedef std::multimap<std::string, boost::std::shared_ptr<dynamic_property_map> > + typedef std::multimap<std::string, boost::shared_ptr<dynamic_property_map> > property_maps_type; - typedef boost::function3<boost::std::shared_ptr<dynamic_property_map>, + typedef boost::function3<boost::shared_ptr<dynamic_property_map>, const std::string&, const boost::any&, const boost::any&> generate_fn_type; @@ -226,7 +226,7 @@ public: dynamic_properties& property(const std::string& name, PropertyMap property_map_) { - boost::std::shared_ptr<dynamic_property_map> pm( + boost::shared_ptr<dynamic_property_map> pm( boost::static_pointer_cast<dynamic_property_map>( boost::make_shared<detail::dynamic_property_map_adaptor<PropertyMap> >(property_map_))); property_maps.insert(property_maps_type::value_type(name, pm)); @@ -246,13 +246,13 @@ public: { return property_maps.lower_bound(name); } void - insert(const std::string& name, boost::std::shared_ptr<dynamic_property_map> pm) + insert(const std::string& name, boost::shared_ptr<dynamic_property_map> pm) { property_maps.insert(property_maps_type::value_type(name, pm)); } template<typename Key, typename Value> - boost::std::shared_ptr<dynamic_property_map> + boost::shared_ptr<dynamic_property_map> generate(const std::string& name, const Key& key, const Value& value) { if(!generate_fn) { @@ -280,7 +280,7 @@ put(const std::string& name, dynamic_properties& dp, const Key& key, } } - boost::std::shared_ptr<dynamic_property_map> new_map = dp.generate(name, key, value); + boost::shared_ptr<dynamic_property_map> new_map = dp.generate(name, key, value); if (new_map.get()) { new_map->put(key, value); dp.insert(name, new_map); @@ -290,7 +290,7 @@ put(const std::string& name, dynamic_properties& dp, const Key& key, } } -#ifndef BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS +#ifndef BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS template<typename Value, typename Key> Value get(const std::string& name, const dynamic_properties& dp, const Key& key) @@ -333,11 +333,11 @@ get(const std::string& name, const dynamic_properties& dp, const Key& key) // The easy way to ignore properties. inline -boost::std::shared_ptr<boost::dynamic_property_map> +boost::shared_ptr<boost::dynamic_property_map> ignore_other_properties(const std::string&, const boost::any&, const boost::any&) { - return boost::std::shared_ptr<boost::dynamic_property_map>(); + return boost::shared_ptr<boost::dynamic_property_map>(); } } // namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/parallel/distributed_property_map.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/parallel/distributed_property_map.hpp index b39202ed..c34e073e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/parallel/distributed_property_map.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/parallel/distributed_property_map.hpp @@ -23,7 +23,7 @@ #include <boost/assert.hpp> #include <boost/type_traits/is_base_and_derived.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <boost/optional.hpp> #include <boost/graph/parallel/process_group.hpp> @@ -93,10 +93,10 @@ namespace detail { template<typename PropertyMap, typename Key, typename Value> static inline void do_put(PropertyMap pm, const Key& key, const Value& value) - { + { using boost::put; - put(pm, key, value); + put(pm, key, value); } }; @@ -240,7 +240,7 @@ class distributed_property_map property_map_put, /** A request to retrieve a particular value in a property - * map. The message contains a key. The owner of that key will + * map. The message contains a key. The owner of that key will * reply with a value. */ property_map_get, @@ -377,7 +377,7 @@ class distributed_property_map reference operator[](const key_type& key) const { owner_local_pair p = get(data->global, key); - + if (p.first == process_id(data->process_group)) { return data->storage[p.second]; } else { @@ -397,11 +397,11 @@ class distributed_property_map * \internal * */ - void + void request_put(process_id_type p, const key_type& k, const value_type& v) const - { - send(data->process_group, p, property_map_put, - boost::parallel::detail::make_untracked_pair(k, v)); + { + send(data->process_group, p, property_map_put, + boost::parallel::detail::make_untracked_pair(k, v)); } /** Access the ghost cell for the given key. @@ -419,11 +419,11 @@ class distributed_property_map struct data_t { - data_t(const ProcessGroup& pg, const GlobalMap& global, + data_t(const ProcessGroup& pg, const GlobalMap& global, const StorageMap& pm, const function1<value_type, key_type>& dv, bool has_default_resolver) - : process_group(pg), global(global), storage(pm), - ghost_cells(), max_ghost_cells(1000000), get_default_value(dv), + : process_group(pg), global(global), storage(pm), + ghost_cells(), max_ghost_cells(1000000), get_default_value(dv), has_default_resolver(has_default_resolver), model(cm_forward) { } /// The process group @@ -437,7 +437,7 @@ class distributed_property_map StorageMap storage; /// The ghost cells - std::shared_ptr<ghost_cells_type> ghost_cells; + shared_ptr<ghost_cells_type> ghost_cells; /// The maximum number of ghost cells we are permitted to hold. If /// zero, we are permitted to have an infinite number of ghost @@ -478,7 +478,7 @@ class distributed_property_map }; friend struct data_t; - std::shared_ptr<data_t> data; + shared_ptr<data_t> data; private: // Prunes the least recently used ghost cells until we have @c @@ -493,36 +493,36 @@ class distributed_property_map template<typename Reduce> struct handle_message { - explicit handle_message(const std::shared_ptr<data_t>& data, + explicit handle_message(const shared_ptr<data_t>& data, const Reduce& reduce = Reduce()) : data_ptr(data), reduce(reduce) { } void operator()(process_id_type source, int tag); /// Individual message handlers - void - handle_put(int source, int tag, - const boost::parallel::detail::untracked_pair<key_type, value_type>& data, + void + handle_put(int source, int tag, + const boost::parallel::detail::untracked_pair<key_type, value_type>& data, trigger_receive_context); value_type - handle_get(int source, int tag, const key_type& data, + handle_get(int source, int tag, const key_type& data, trigger_receive_context); void - handle_multiget(int source, int tag, + handle_multiget(int source, int tag, const std::vector<key_type>& data, trigger_receive_context); void handle_multiget_reply - (int source, int tag, + (int source, int tag, const std::vector<boost::parallel::detail::untracked_pair<key_type, value_type> >& msg, trigger_receive_context); void handle_multiput - (int source, int tag, + (int source, int tag, const std::vector<unsafe_pair<local_key_type, value_type> >& data, trigger_receive_context); @@ -537,7 +537,7 @@ class distributed_property_map bidirectional consistency. */ struct on_synchronize { - explicit on_synchronize(const std::shared_ptr<data_t>& data) : data_ptr(data) { } + explicit on_synchronize(const shared_ptr<data_t>& data) : data_ptr(data) { } void operator()(); @@ -581,7 +581,7 @@ get(const PBGL_DISTRIB_PMAP& pm, { using boost::get; - typename property_traits<GlobalMap>::value_type p = + typename property_traits<GlobalMap>::value_type p = get(pm.data->global, key); if (p.first == process_id(pm.data->process_group)) { @@ -609,13 +609,13 @@ put(const PBGL_DISTRIB_PMAP& pm, { using boost::put; - typename property_traits<GlobalMap>::value_type p = + typename property_traits<GlobalMap>::value_type p = get(pm.data->global, key); if (p.first == process_id(pm.data->process_group)) { put(pm.data->storage, p.second, value); } else { - if (pm.data->model & cm_forward) + if (pm.data->model & cm_forward) pm.request_put(p.first, key, value); pm.cell(key, false) = value; @@ -637,7 +637,7 @@ local_put(const PBGL_DISTRIB_PMAP& pm, { using boost::put; - typename property_traits<GlobalMap>::value_type p = + typename property_traits<GlobalMap>::value_type p = get(pm.data->global, key); if (p.first == process_id(pm.data->process_group)) @@ -669,7 +669,7 @@ synchronize(PBGL_DISTRIB_PMAP& pm) /// Create a distributed property map. template<typename ProcessGroup, typename GlobalMap, typename StorageMap> inline distributed_property_map<ProcessGroup, GlobalMap, StorageMap> -make_distributed_property_map(const ProcessGroup& pg, GlobalMap global, +make_distributed_property_map(const ProcessGroup& pg, GlobalMap global, StorageMap storage) { typedef distributed_property_map<ProcessGroup, GlobalMap, StorageMap> @@ -680,10 +680,10 @@ make_distributed_property_map(const ProcessGroup& pg, GlobalMap global, /** * \overload */ -template<typename ProcessGroup, typename GlobalMap, typename StorageMap, +template<typename ProcessGroup, typename GlobalMap, typename StorageMap, typename Reduce> inline distributed_property_map<ProcessGroup, GlobalMap, StorageMap> -make_distributed_property_map(const ProcessGroup& pg, GlobalMap global, +make_distributed_property_map(const ProcessGroup& pg, GlobalMap global, StorageMap storage, Reduce reduce) { typedef distributed_property_map<ProcessGroup, GlobalMap, StorageMap> diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/parallel/global_index_map.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/parallel/global_index_map.hpp index eae5d112..e40d27a0 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/parallel/global_index_map.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/parallel/global_index_map.hpp @@ -15,7 +15,7 @@ #include <boost/property_map/property_map.hpp> #include <vector> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> namespace boost { namespace parallel { @@ -29,7 +29,7 @@ public: typedef readable_property_map_tag category; template<typename ProcessGroup> - global_index_map(ProcessGroup pg, value_type num_local_indices, + global_index_map(ProcessGroup pg, value_type num_local_indices, IndexMap index_map, GlobalMap global) : index_map(index_map), global(global) { @@ -37,7 +37,7 @@ public: starting_index.reset(new std::vector<value_type>(num_processes(pg) + 1)); send(pg, 0, 0, num_local_indices); synchronize(pg); - + // Populate starting_index in all processes if (process_id(pg) == 0) { (*starting_index)[0] = 0; @@ -55,7 +55,7 @@ public: } } - friend inline value_type + friend inline value_type get(const global_index_map& gim, const key_type& x) { using boost::get; @@ -64,7 +64,7 @@ public: } private: - std::shared_ptr<std::vector<value_type> > starting_index; + shared_ptr<std::vector<value_type> > starting_index; IndexMap index_map; GlobalMap global; }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/parallel/impl/distributed_property_map.ipp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/parallel/impl/distributed_property_map.ipp index d47d6856..ef20817f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/parallel/impl/distributed_property_map.ipp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/parallel/impl/distributed_property_map.ipp @@ -41,7 +41,7 @@ PBGL_DISTRIB_PMAP::~distributed_property_map() { } template<typename ProcessGroup, typename GlobalMap, typename StorageMap> template<typename Reduce> -void +void PBGL_DISTRIB_PMAP::set_reduce(const Reduce& reduce) { typedef handle_message<Reduce> Handler; @@ -69,7 +69,7 @@ void PBGL_DISTRIB_PMAP::prune_ghost_cells() const // We need to flush values when we evict them. boost::parallel::detail::untracked_pair<key_type, value_type> const& victim = data->ghost_cells->back(); - send(data->process_group, get(data->global, victim.first).first, + send(data->process_group, get(data->global, victim.first).first, property_map_put, victim); } @@ -83,11 +83,11 @@ typename PBGL_DISTRIB_PMAP::value_type& PBGL_DISTRIB_PMAP::cell(const key_type& key, bool request_if_missing) const { // Index by key - ghost_cells_key_index_type const& key_index + ghost_cells_key_index_type const& key_index = data->ghost_cells->template get<1>(); // Search for the ghost cell by key, and project back to the sequence - iterator ghost_cell + iterator ghost_cell = data->ghost_cells->template project<0>(key_index.find(key)); if (ghost_cell == data->ghost_cells->end()) { value_type value; @@ -97,13 +97,13 @@ PBGL_DISTRIB_PMAP::cell(const key_type& key, bool request_if_missing) const value = data->get_default_value(key); else if (request_if_missing) // Request the actual value of this key from its owner - send_oob_with_reply(data->process_group, get(data->global, key).first, + send_oob_with_reply(data->process_group, get(data->global, key).first, property_map_get, key, value); else value = value_type(); // Create a ghost cell containing the new value - ghost_cell + ghost_cell = data->ghost_cells->push_front(std::make_pair(key, value)).first; // If we need to, prune the ghost cells @@ -129,12 +129,12 @@ template<typename ProcessGroup, typename GlobalMap, typename StorageMap> template<typename Reduce> void PBGL_DISTRIB_PMAP::handle_message<Reduce>:: -handle_put(int /*source*/, int /*tag*/, +handle_put(int /*source*/, int /*tag*/, const boost::parallel::detail::untracked_pair<key_type, value_type>& req, trigger_receive_context) { using boost::get; - std::shared_ptr<data_t> data(data_ptr); + shared_ptr<data_t> data(data_ptr); owner_local_pair p = get(data->global, req.first); BOOST_ASSERT(p.first == process_id(data->process_group)); @@ -149,12 +149,12 @@ template<typename ProcessGroup, typename GlobalMap, typename StorageMap> template<typename Reduce> typename PBGL_DISTRIB_PMAP::value_type PBGL_DISTRIB_PMAP::handle_message<Reduce>:: -handle_get(int source, int /*tag*/, const key_type& key, +handle_get(int source, int /*tag*/, const key_type& key, trigger_receive_context) { using boost::get; - std::shared_ptr<data_t> data(data_ptr); + shared_ptr<data_t> data(data_ptr); BOOST_ASSERT(data); owner_local_pair p = get(data->global, key); @@ -168,7 +168,7 @@ PBGL_DISTRIB_PMAP::handle_message<Reduce>:: handle_multiget(int source, int tag, const std::vector<key_type>& keys, trigger_receive_context) { - std::shared_ptr<data_t> data(data_ptr); + shared_ptr<data_t> data(data_ptr); BOOST_ASSERT(data); typedef boost::parallel::detail::untracked_pair<key_type, value_type> key_value; @@ -190,15 +190,15 @@ template<typename Reduce> void PBGL_DISTRIB_PMAP::handle_message<Reduce>:: handle_multiget_reply - (int source, int tag, + (int source, int tag, const std::vector<boost::parallel::detail::untracked_pair<key_type, value_type> >& msg, trigger_receive_context) { - std::shared_ptr<data_t> data(data_ptr); + shared_ptr<data_t> data(data_ptr); BOOST_ASSERT(data); // Index by key - ghost_cells_key_index_type const& key_index + ghost_cells_key_index_type const& key_index = data->ghost_cells->template get<1>(); std::size_t n = msg.size(); @@ -217,13 +217,13 @@ template<typename Reduce> void PBGL_DISTRIB_PMAP::handle_message<Reduce>:: handle_multiput - (int source, int tag, + (int source, int tag, const std::vector<unsafe_pair<local_key_type, value_type> >& values, trigger_receive_context) { using boost::get; - std::shared_ptr<data_t> data(data_ptr); + shared_ptr<data_t> data(data_ptr); BOOST_ASSERT(data); std::size_t n = values.size(); @@ -247,11 +247,11 @@ setup_triggers(process_group_type& pg) simple_trigger(pg, property_map_put, this, &handle_message::handle_put); simple_trigger(pg, property_map_get, this, &handle_message::handle_get); - simple_trigger(pg, property_map_multiget, this, + simple_trigger(pg, property_map_multiget, this, &handle_message::handle_multiget); - simple_trigger(pg, property_map_multiget_reply, this, + simple_trigger(pg, property_map_multiget_reply, this, &handle_message::handle_multiget_reply); - simple_trigger(pg, property_map_multiput, this, + simple_trigger(pg, property_map_multiput, this, &handle_message::handle_multiput); } @@ -261,7 +261,7 @@ PBGL_DISTRIB_PMAP ::on_synchronize::operator()() { int stage=0; // we only get called at the start now - std::shared_ptr<data_t> data(data_ptr); + shared_ptr<data_t> data(data_ptr); BOOST_ASSERT(data); // Determine in which stage backward consistency messages should be sent. @@ -371,7 +371,7 @@ void PBGL_DISTRIB_PMAP::data_t::refresh_ghost_cells() for (process_size_type p = (id + 1) % n ; p != id ; p = (p + 1) % n) { if (!keys[p].empty()) send(process_group, p, property_map_multiget, keys[p]); - } + } } template<typename ProcessGroup, typename GlobalMap, typename StorageMap> diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/vector_property_map.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/vector_property_map.hpp index 46d7924a..a97fb810 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/vector_property_map.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/property_map/vector_property_map.hpp @@ -11,29 +11,29 @@ #define VECTOR_PROPERTY_MAP_HPP_VP_2003_03_04 #include <boost/property_map/property_map.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <vector> namespace boost { template<typename T, typename IndexMap = identity_property_map> class vector_property_map - : public boost::put_get_helper< - typename std::iterator_traits< + : public boost::put_get_helper< + typename std::iterator_traits< typename std::vector<T>::iterator >::reference, vector_property_map<T, IndexMap> > { public: typedef typename property_traits<IndexMap>::key_type key_type; typedef T value_type; - typedef typename std::iterator_traits< + typedef typename std::iterator_traits< typename std::vector<T>::iterator >::reference reference; typedef boost::lvalue_property_map_tag category; - + vector_property_map(const IndexMap& index = IndexMap()) : store(new std::vector<T>()), index(index) {} - vector_property_map(unsigned initial_size, + vector_property_map(unsigned initial_size, const IndexMap& index = IndexMap()) : store(new std::vector<T>(initial_size)), index(index) {} @@ -57,15 +57,15 @@ namespace boost { { return store->end(); } - + IndexMap& get_index_map() { return index; } const IndexMap& get_index_map() const { return index; } - + public: // Copy ctor absent, default semantics is OK. // Assignment operator absent, default semantics is OK. // CONSIDER: not sure that assignment to 'index' is correct. - + reference operator[](const key_type& v) const { typename property_traits<IndexMap>::value_type i = get(index, v); if (static_cast<unsigned>(i) >= store->size()) { @@ -74,16 +74,16 @@ namespace boost { return (*store)[i]; } private: - // Conceptually, we have a vector of infinite size. For practical + // Conceptually, we have a vector of infinite size. For practical // purposes, we start with an empty vector and grow it as needed. // Note that we cannot store pointer to vector here -- we cannot // store pointer to data, because if copy of property map resizes - // the vector, the pointer to data will be invalidated. + // the vector, the pointer to data will be invalidated. // I wonder if class 'pmap_ref' is simply needed. - std::shared_ptr< std::vector<T> > store; + shared_ptr< std::vector<T> > store; IndexMap index; }; - + template<typename T, typename IndexMap> vector_property_map<T, IndexMap> make_vector_property_map(IndexMap index) @@ -103,15 +103,15 @@ namespace boost { * This specialization of @ref vector_property_map builds a * distributed vector property map given the local index maps * generated by distributed graph types that automatically have index - * properties. + * properties. * * This specialization is useful when creating external distributed * property maps via the same syntax used to create external * sequential property maps. */ -template<typename T, typename ProcessGroup, typename GlobalMap, +template<typename T, typename ProcessGroup, typename GlobalMap, typename StorageMap> -class vector_property_map<T, +class vector_property_map<T, local_property_map<ProcessGroup, GlobalMap, StorageMap> > : public parallel::distributed_property_map< @@ -119,7 +119,7 @@ class vector_property_map<T, { typedef vector_property_map<T, StorageMap> local_iterator_map; - typedef parallel::distributed_property_map<ProcessGroup, GlobalMap, + typedef parallel::distributed_property_map<ProcessGroup, GlobalMap, local_iterator_map> inherited; typedef local_property_map<ProcessGroup, GlobalMap, StorageMap> index_map_type; @@ -129,7 +129,7 @@ public: : inherited(index.process_group(), index.global(), local_iterator_map(index.base())) { } - vector_property_map(unsigned inital_size, + vector_property_map(unsigned inital_size, const index_map_type& index = index_map_type()) : inherited(index.process_group(), index.global(), local_iterator_map(inital_size, index.base())) { } @@ -140,31 +140,31 @@ public: * This specialization of @ref vector_property_map builds a * distributed vector property map given the local index maps * generated by distributed graph types that automatically have index - * properties. + * properties. * * This specialization is useful when creating external distributed * property maps via the same syntax used to create external * sequential property maps. */ -template<typename T, typename ProcessGroup, typename GlobalMap, +template<typename T, typename ProcessGroup, typename GlobalMap, typename StorageMap> class vector_property_map< - T, + T, parallel::distributed_property_map< ProcessGroup, GlobalMap, StorageMap > - > + > : public parallel::distributed_property_map< ProcessGroup, GlobalMap, vector_property_map<T, StorageMap> > { typedef vector_property_map<T, StorageMap> local_iterator_map; - typedef parallel::distributed_property_map<ProcessGroup, GlobalMap, + typedef parallel::distributed_property_map<ProcessGroup, GlobalMap, local_iterator_map> inherited; - typedef parallel::distributed_property_map<ProcessGroup, GlobalMap, + typedef parallel::distributed_property_map<ProcessGroup, GlobalMap, StorageMap> index_map_type; @@ -173,7 +173,7 @@ public: : inherited(index.process_group(), index.global(), local_iterator_map(index.base())) { } - vector_property_map(unsigned inital_size, + vector_property_map(unsigned inital_size, const index_map_type& index = index_map_type()) : inherited(index.process_group(), index.global(), local_iterator_map(inital_size, index.base())) { } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/ptr_container/clone_allocator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/ptr_container/clone_allocator.hpp index f0842884..6d396e80 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/ptr_container/clone_allocator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/ptr_container/clone_allocator.hpp @@ -19,9 +19,9 @@ namespace boost { ///////////////////////////////////////////////////////////////////////// - // Clonable concept + // Clonable concept ///////////////////////////////////////////////////////////////////////// - + template< class T > inline T* new_clone( const T& r ) { @@ -43,13 +43,13 @@ namespace boost return r ? new_clone( *r ) : 0; } - // + // // @remark: to make new_clone() work - // with scope_ptr/std::shared_ptr ect. + // with scope_ptr/shared_ptr ect. // simply overload for those types // in the appropriate namespace. - // - + // + template< class T > inline void delete_clone( const T* r ) { @@ -59,7 +59,7 @@ namespace boost ///////////////////////////////////////////////////////////////////////// // CloneAllocator concept ///////////////////////////////////////////////////////////////////////// - + struct heap_clone_allocator { template< class U > @@ -77,7 +77,7 @@ namespace boost }; - + struct view_clone_allocator { template< class U > diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/registered.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/registered.hpp index 36816b1f..2404cb0f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/registered.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/registered.hpp @@ -16,12 +16,12 @@ namespace boost { -// You'll see std::shared_ptr mentioned in this header because we need to +// You'll see shared_ptr mentioned in this header because we need to // note which types are shared_ptrs in their registrations, to -// implement special std::shared_ptr handling for rvalue conversions. -template <class T> class std::shared_ptr; +// implement special shared_ptr handling for rvalue conversions. +template <class T> class shared_ptr; -namespace python { namespace converter { +namespace python { namespace converter { struct registration; @@ -64,23 +64,23 @@ namespace detail register_shared_ptr0(...) { } - + template <class T> inline void - register_shared_ptr0(std::shared_ptr<T>*) + register_shared_ptr0(shared_ptr<T>*) { - registry::lookup_shared_ptr(type_id<std::shared_ptr<T> >()); + registry::lookup_shared_ptr(type_id<shared_ptr<T> >()); } - + template <class T> inline void register_shared_ptr1(T const volatile*) { detail::register_shared_ptr0((T*)0); } - + template <class T> - inline registration const& + inline registration const& registry_lookup2(T&(*)()) { detail::register_shared_ptr1((T*)0); @@ -88,13 +88,13 @@ namespace detail } template <class T> - inline registration const& + inline registration const& registry_lookup1(type<T>) { return registry_lookup2((T(*)())0); } - inline registration const& + inline registration const& registry_lookup1(type<const volatile void>) { detail::register_shared_ptr1((void*)0); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/registrations.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/registrations.hpp index 2c88b7ad..7ef74e8f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/registrations.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/registrations.hpp @@ -15,7 +15,7 @@ # include <boost/detail/workaround.hpp> -namespace boost { namespace python { namespace converter { +namespace boost { namespace python { namespace converter { struct lvalue_from_python_chain { @@ -36,7 +36,7 @@ struct BOOST_PYTHON_DECL registration public: // member functions explicit registration(type_info target, bool is_shared_ptr = false); ~registration(); - + // Convert the appropriately-typed data to Python PyObject* to_python(void const volatile*) const; @@ -44,7 +44,7 @@ struct BOOST_PYTHON_DECL registration // exception if no class has been registered. PyTypeObject* get_class_object() const; - // Return common denominator of the python class objects, + // Return common denominator of the python class objects, // convertable to target. Inspects the m_class_object and the value_chains. PyTypeObject const* expected_from_python_type() const; PyTypeObject const* to_python_target_type() const; @@ -57,7 +57,7 @@ struct BOOST_PYTHON_DECL registration // The chain of eligible from_python converters when an rvalue is acceptable rvalue_from_python_chain* rvalue_chain; - + // The class object associated with this type PyTypeObject* m_class_object; @@ -66,14 +66,14 @@ struct BOOST_PYTHON_DECL registration PyTypeObject const* (*m_to_python_target_type)(); - // True iff this type is a std::shared_ptr. Needed for special rvalue + // True iff this type is a shared_ptr. Needed for special rvalue // from_python handling. const bool is_shared_ptr; # if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) private: void operator=(registration); // This is not defined, and just keeps MWCW happy. -# endif +# endif }; // diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/registry.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/registry.hpp index f09356d6..368adcc6 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/registry.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/registry.hpp @@ -21,12 +21,12 @@ namespace registry BOOST_PYTHON_DECL registration const& lookup(type_info); // Get the registration corresponding to the type, creating it if - // necessary. Use this first when the type is a std::shared_ptr. + // necessary. Use this first when the type is a shared_ptr. BOOST_PYTHON_DECL registration const& lookup_shared_ptr(type_info); // Return a pointer to the corresponding registration, if one exists BOOST_PYTHON_DECL registration const* query(type_info); - + BOOST_PYTHON_DECL void insert(to_python_function_t, type_info, PyTypeObject const* (*to_python_target_type)() = 0); // Insert an lvalue from_python converter @@ -39,7 +39,7 @@ namespace registry , type_info , PyTypeObject const* (*expected_pytype)() = 0 ); - + // Insert an rvalue from_python converter at the tail of the // chain. Used for implicit conversions BOOST_PYTHON_DECL void push_back( diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/shared_ptr_from_python.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/shared_ptr_from_python.hpp index d7905d2c..c0910776 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/shared_ptr_from_python.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/shared_ptr_from_python.hpp @@ -13,16 +13,16 @@ #ifndef BOOST_PYTHON_NO_PY_SIGNATURES # include <boost/python/converter/pytype_function.hpp> #endif -# include <boost/std::shared_ptr.hpp> +# include <boost/shared_ptr.hpp> -namespace boost { namespace python { namespace converter { +namespace boost { namespace python { namespace converter { template <class T> struct shared_ptr_from_python { shared_ptr_from_python() { - converter::registry::insert(&convertible, &construct, type_id<std::shared_ptr<T> >() + converter::registry::insert(&convertible, &construct, type_id<shared_ptr<T> >() #ifndef BOOST_PYTHON_NO_PY_SIGNATURES , &converter::expected_from_python_type_direct<T>::get_pytype #endif @@ -34,26 +34,26 @@ struct shared_ptr_from_python { if (p == Py_None) return p; - + return converter::get_lvalue_from_python(p, registered<T>::converters); } - + static void construct(PyObject* source, rvalue_from_python_stage1_data* data) { - void* const storage = ((converter::rvalue_from_python_storage<std::shared_ptr<T> >*)data)->storage.bytes; + void* const storage = ((converter::rvalue_from_python_storage<shared_ptr<T> >*)data)->storage.bytes; // Deal with the "None" case. if (data->convertible == source) - new (storage) std::shared_ptr<T>(); + new (storage) shared_ptr<T>(); else { - boost::std::shared_ptr<void> hold_convertible_ref_count( + boost::shared_ptr<void> hold_convertible_ref_count( (void*)0, shared_ptr_deleter(handle<>(borrowed(source))) ); // use aliasing constructor - new (storage) std::shared_ptr<T>( + new (storage) shared_ptr<T>( hold_convertible_ref_count, static_cast<T*>(data->convertible)); } - + data->convertible = storage; } }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/shared_ptr_to_python.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/shared_ptr_to_python.hpp index cba75647..fe867ace 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/shared_ptr_to_python.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/converter/shared_ptr_to_python.hpp @@ -7,20 +7,20 @@ # include <boost/python/refcount.hpp> # include <boost/python/converter/shared_ptr_deleter.hpp> -# include <boost/std::shared_ptr.hpp> +# include <boost/shared_ptr.hpp> # include <boost/get_pointer.hpp> -namespace boost { namespace python { namespace converter { +namespace boost { namespace python { namespace converter { template <class T> -PyObject* shared_ptr_to_python(std::shared_ptr<T> const& x) +PyObject* shared_ptr_to_python(shared_ptr<T> const& x) { if (!x) return python::detail::none(); else if (shared_ptr_deleter* d = boost::get_deleter<shared_ptr_deleter>(x)) return incref( get_pointer( d->owner ) ); else - return converter::registered<std::shared_ptr<T> const&>::converters.to_python(&x); + return converter::registered<shared_ptr<T> const&>::converters.to_python(&x); } }}} // namespace boost::python::converter diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/detail/is_shared_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/detail/is_shared_ptr.hpp index ae94c900..547af3f1 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/detail/is_shared_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/detail/is_shared_ptr.hpp @@ -6,12 +6,12 @@ # define IS_SHARED_PTR_DWA2003224_HPP # include <boost/python/detail/is_xxx.hpp> -# include <boost/std::shared_ptr.hpp> +# include <boost/shared_ptr.hpp> -namespace boost { namespace python { namespace detail { - -BOOST_PYTHON_IS_XXX_DEF(std::shared_ptr, std::shared_ptr, 1) +namespace boost { namespace python { namespace detail { +BOOST_PYTHON_IS_XXX_DEF(shared_ptr, shared_ptr, 1) + }}} // namespace boost::python::detail #endif // IS_SHARED_PTR_DWA2003224_HPP diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/detail/value_is_shared_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/detail/value_is_shared_ptr.hpp index f2952cbb..361c369b 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/detail/value_is_shared_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/detail/value_is_shared_ptr.hpp @@ -6,12 +6,12 @@ # define VALUE_IS_SHARED_PTR_DWA2003224_HPP # include <boost/python/detail/value_is_xxx.hpp> -# include <boost/std::shared_ptr.hpp> +# include <boost/shared_ptr.hpp> -namespace boost { namespace python { namespace detail { - -BOOST_PYTHON_VALUE_IS_XXX_DEF(std::shared_ptr, std::shared_ptr, 1) +namespace boost { namespace python { namespace detail { +BOOST_PYTHON_VALUE_IS_XXX_DEF(shared_ptr, shared_ptr, 1) + }}} // namespace boost::python::detail #endif // VALUE_IS_SHARED_PTR_DWA2003224_HPP diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/instance_holder.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/instance_holder.hpp index 86d82964..933f50d1 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/instance_holder.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/instance_holder.hpp @@ -11,7 +11,7 @@ # include <boost/python/type_id.hpp> # include <cstddef> -namespace boost { namespace python { +namespace boost { namespace python { // Base class for all holders struct BOOST_PYTHON_DECL instance_holder : private noncopyable @@ -19,13 +19,13 @@ struct BOOST_PYTHON_DECL instance_holder : private noncopyable public: instance_holder(); virtual ~instance_holder(); - + // return the next holder in a chain instance_holder* next() const; // When the derived holder actually holds by [smart] pointer and // null_ptr_only is set, only report that the type is held when - // the pointer is null. This is needed for proper std::shared_ptr + // the pointer is null. This is needed for proper shared_ptr // support, to prevent holding shared_ptrs from being found when // converting from python so that we can use the conversion method // that always holds the Python object. @@ -34,7 +34,7 @@ struct BOOST_PYTHON_DECL instance_holder : private noncopyable void install(PyObject* inst) throw(); // These functions should probably be located elsewhere. - + // Allocate storage for an object of the given size at the given // offset in the Python instance<> object if bytes are available // there. Otherwise allocate size bytes of heap memory. diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/object/find_instance.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/object/find_instance.hpp index 76b57a0f..3202c1cd 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/object/find_instance.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/object/find_instance.hpp @@ -7,12 +7,12 @@ # include <boost/python/type_id.hpp> -namespace boost { namespace python { namespace objects { +namespace boost { namespace python { namespace objects { // Given a type_id, find the instance data which corresponds to it, or // return 0 in case no such type is held. If null_shared_ptr_only is -// true and the type being sought is a std::shared_ptr, only find an -// instance if it turns out to be NULL. Needed for std::shared_ptr rvalue +// true and the type being sought is a shared_ptr, only find an +// instance if it turns out to be NULL. Needed for shared_ptr rvalue // from_python support. BOOST_PYTHON_DECL void* find_instance_impl(PyObject*, type_info, bool null_shared_ptr_only = false); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/object/inheritance.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/object/inheritance.hpp index 948baa42..b49a0442 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/object/inheritance.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/object/inheritance.hpp @@ -6,7 +6,7 @@ # define INHERITANCE_DWA200216_HPP # include <boost/python/type_id.hpp> -# include <boost/std::shared_ptr.hpp> +# include <boost/shared_ptr.hpp> # include <boost/mpl/if.hpp> # include <boost/type_traits/is_polymorphic.hpp> # include <boost/type_traits/is_base_and_derived.hpp> @@ -88,7 +88,7 @@ struct dynamic_cast_generator return dynamic_cast<Target*>( static_cast<Source*>(source)); } - + }; template <class Source, class Target> diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/to_python_indirect.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/to_python_indirect.hpp index df660a3a..23ad0263 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/to_python_indirect.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/to_python_indirect.hpp @@ -23,9 +23,9 @@ # include <boost/mpl/bool.hpp> -# if defined(__ICL) && __ICL < 600 -# include <boost/std::shared_ptr.hpp> -# else +# if defined(__ICL) && __ICL < 600 +# include <boost/shared_ptr.hpp> +# else # include <memory> # endif @@ -57,7 +57,7 @@ struct to_python_indirect else return this->execute(*ptr, mpl::false_()); } - + template <class U> inline PyObject* execute(U const& x, mpl::false_) const { @@ -84,9 +84,9 @@ namespace detail // can't use auto_ptr with Intel 5 and VC6 Dinkum library // for some reason. We get link errors against the auto_ptr // copy constructor. -# if defined(__ICL) && __ICL < 600 - typedef boost::std::shared_ptr<T> smart_pointer; -# else +# if defined(__ICL) && __ICL < 600 + typedef boost::shared_ptr<T> smart_pointer; +# else typedef std::auto_ptr<T> smart_pointer; # endif typedef objects::pointer_holder<smart_pointer, T> holder_t; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/to_python_value.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/to_python_value.hpp index 1628a93b..a48948d2 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/to_python_value.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/python/to_python_value.hpp @@ -26,7 +26,7 @@ # include <boost/mpl/or.hpp> # include <boost/type_traits/is_const.hpp> -namespace boost { namespace python { +namespace boost { namespace python { namespace detail { @@ -58,7 +58,7 @@ struct object_manager_get_pytype<true> struct object_manager_to_python_value { typedef typename value_arg<T>::type argument_type; - + PyObject* operator()(argument_type) const; #ifndef BOOST_PYTHON_NO_PY_SIGNATURES typedef boost::mpl::bool_<is_handle<T>::value> is_t_handle; @@ -68,13 +68,13 @@ struct object_manager_get_pytype<true> } inline static PyTypeObject const* get_pytype_aux(mpl::true_*) {return converter::object_manager_traits<T>::get_pytype();} - - inline static PyTypeObject const* get_pytype_aux(mpl::false_* ) + + inline static PyTypeObject const* get_pytype_aux(mpl::false_* ) { return object_manager_get_pytype<is_t_const::value>::get((T(*)())0); } - -#endif + +#endif // This information helps make_getter() decide whether to try to // return an internal reference or not. I don't like it much, @@ -82,12 +82,12 @@ struct object_manager_get_pytype<true> BOOST_STATIC_CONSTANT(bool, uses_registry = false); }; - + template <class T> struct registry_to_python_value { typedef typename value_arg<T>::type argument_type; - + PyObject* operator()(argument_type) const; #ifndef BOOST_PYTHON_NO_PY_SIGNATURES PyTypeObject const* get_pytype() const {return converter::registered<T>::converters.to_python_target_type();} @@ -103,11 +103,11 @@ struct object_manager_get_pytype<true> struct shared_ptr_to_python_value { typedef typename value_arg<T>::type argument_type; - + PyObject* operator()(argument_type) const; #ifndef BOOST_PYTHON_NO_PY_SIGNATURES PyTypeObject const* get_pytype() const {return get_pytype((boost::type<argument_type>*)0);} -#endif +#endif // This information helps make_getter() decide whether to try to // return an internal reference or not. I don't like it much, // but it will have to serve for now. @@ -115,9 +115,9 @@ struct object_manager_get_pytype<true> private: #ifndef BOOST_PYTHON_NO_PY_SIGNATURES template <class U> - PyTypeObject const* get_pytype(boost::type<std::shared_ptr<U> &> *) const {return converter::registered<U>::converters.to_python_target_type();} + PyTypeObject const* get_pytype(boost::type<shared_ptr<U> &> *) const {return converter::registered<U>::converters.to_python_target_type();} template <class U> - PyTypeObject const* get_pytype(boost::type<const std::shared_ptr<U> &> *) const {return converter::registered<U>::converters.to_python_target_type();} + PyTypeObject const* get_pytype(boost::type<const shared_ptr<U> &> *) const {return converter::registered<U>::converters.to_python_target_type();} #endif }; } @@ -140,7 +140,7 @@ struct to_python_value }; // -// implementation +// implementation // namespace detail { @@ -151,7 +151,7 @@ namespace detail # if BOOST_WORKAROUND(__GNUC__, < 3) // suppresses an ICE, somehow (void)r::converters; -# endif +# endif return converter::registered<argument_type>::converters.to_python(&x); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/icu.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/icu.hpp index a3d84b74..772806e9 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/icu.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/icu.hpp @@ -3,8 +3,8 @@ * Copyright (c) 2004 * John Maddock * - * Use, modification and distribution are subject to the - * Boost Software License, Version 1.0. (See accompanying file + * Use, modification and distribution are subject to the + * Boost Software License, Version 1.0. (See accompanying file * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * */ @@ -36,7 +36,7 @@ namespace boost{ namespace re_detail{ -// +// // Implementation details: // class BOOST_REGEX_DECL icu_regex_traits_implementation @@ -85,9 +85,9 @@ private: boost::scoped_ptr< U_NAMESPACE_QUALIFIER Collator> m_primary_collator; // The primary collation object }; -inline boost::std::shared_ptr<icu_regex_traits_implementation> get_icu_regex_traits_implementation(const U_NAMESPACE_QUALIFIER Locale& loc) +inline boost::shared_ptr<icu_regex_traits_implementation> get_icu_regex_traits_implementation(const U_NAMESPACE_QUALIFIER Locale& loc) { - return boost::std::shared_ptr<icu_regex_traits_implementation>(new icu_regex_traits_implementation(loc)); + return boost::shared_ptr<icu_regex_traits_implementation>(new icu_regex_traits_implementation(loc)); } } @@ -208,7 +208,7 @@ private: static char_class_type lookup_icu_mask(const ::UChar32* p1, const ::UChar32* p2); - boost::std::shared_ptr< ::boost::re_detail::icu_regex_traits_implementation> m_pimpl; + boost::shared_ptr< ::boost::re_detail::icu_regex_traits_implementation> m_pimpl; }; } // namespace boost @@ -245,9 +245,9 @@ namespace re_detail{ #if !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__) template <class InputIterator> -inline u32regex do_make_u32regex(InputIterator i, - InputIterator j, - boost::regex_constants::syntax_option_type opt, +inline u32regex do_make_u32regex(InputIterator i, + InputIterator j, + boost::regex_constants::syntax_option_type opt, const boost::mpl::int_<1>*) { typedef boost::u8_to_u32_iterator<InputIterator, UChar32> conv_type; @@ -255,9 +255,9 @@ inline u32regex do_make_u32regex(InputIterator i, } template <class InputIterator> -inline u32regex do_make_u32regex(InputIterator i, - InputIterator j, - boost::regex_constants::syntax_option_type opt, +inline u32regex do_make_u32regex(InputIterator i, + InputIterator j, + boost::regex_constants::syntax_option_type opt, const boost::mpl::int_<2>*) { typedef boost::u16_to_u32_iterator<InputIterator, UChar32> conv_type; @@ -265,18 +265,18 @@ inline u32regex do_make_u32regex(InputIterator i, } template <class InputIterator> -inline u32regex do_make_u32regex(InputIterator i, - InputIterator j, - boost::regex_constants::syntax_option_type opt, +inline u32regex do_make_u32regex(InputIterator i, + InputIterator j, + boost::regex_constants::syntax_option_type opt, const boost::mpl::int_<4>*) { return u32regex(i, j, opt); } #else template <class InputIterator> -inline u32regex do_make_u32regex(InputIterator i, - InputIterator j, - boost::regex_constants::syntax_option_type opt, +inline u32regex do_make_u32regex(InputIterator i, + InputIterator j, + boost::regex_constants::syntax_option_type opt, const boost::mpl::int_<1>*) { typedef boost::u8_to_u32_iterator<InputIterator, UChar32> conv_type; @@ -294,9 +294,9 @@ inline u32regex do_make_u32regex(InputIterator i, } template <class InputIterator> -inline u32regex do_make_u32regex(InputIterator i, - InputIterator j, - boost::regex_constants::syntax_option_type opt, +inline u32regex do_make_u32regex(InputIterator i, + InputIterator j, + boost::regex_constants::syntax_option_type opt, const boost::mpl::int_<2>*) { typedef boost::u16_to_u32_iterator<InputIterator, UChar32> conv_type; @@ -314,9 +314,9 @@ inline u32regex do_make_u32regex(InputIterator i, } template <class InputIterator> -inline u32regex do_make_u32regex(InputIterator i, - InputIterator j, - boost::regex_constants::syntax_option_type opt, +inline u32regex do_make_u32regex(InputIterator i, + InputIterator j, + boost::regex_constants::syntax_option_type opt, const boost::mpl::int_<4>*) { typedef std::vector<UChar32> vector_type; @@ -337,8 +337,8 @@ inline u32regex do_make_u32regex(InputIterator i, // Construction from an iterator pair: // template <class InputIterator> -inline u32regex make_u32regex(InputIterator i, - InputIterator j, +inline u32regex make_u32regex(InputIterator i, + InputIterator j, boost::regex_constants::syntax_option_type opt) { return re_detail::do_make_u32regex(i, j, opt, static_cast<boost::mpl::int_<sizeof(*i)> const*>(0)); @@ -406,18 +406,18 @@ void copy_results(MR1& out, MR2 const& in) } template <class BidiIterator, class Allocator> -inline bool do_regex_match(BidiIterator first, BidiIterator last, - match_results<BidiIterator, Allocator>& m, - const u32regex& e, +inline bool do_regex_match(BidiIterator first, BidiIterator last, + match_results<BidiIterator, Allocator>& m, + const u32regex& e, match_flag_type flags, boost::mpl::int_<4> const*) { return ::boost::regex_match(first, last, m, e, flags); } template <class BidiIterator, class Allocator> -bool do_regex_match(BidiIterator first, BidiIterator last, - match_results<BidiIterator, Allocator>& m, - const u32regex& e, +bool do_regex_match(BidiIterator first, BidiIterator last, + match_results<BidiIterator, Allocator>& m, + const u32regex& e, match_flag_type flags, boost::mpl::int_<2> const*) { @@ -431,9 +431,9 @@ bool do_regex_match(BidiIterator first, BidiIterator last, return result; } template <class BidiIterator, class Allocator> -bool do_regex_match(BidiIterator first, BidiIterator last, - match_results<BidiIterator, Allocator>& m, - const u32regex& e, +bool do_regex_match(BidiIterator first, BidiIterator last, + match_results<BidiIterator, Allocator>& m, + const u32regex& e, match_flag_type flags, boost::mpl::int_<1> const*) { @@ -449,62 +449,62 @@ bool do_regex_match(BidiIterator first, BidiIterator last, } // namespace re_detail template <class BidiIterator, class Allocator> -inline bool u32regex_match(BidiIterator first, BidiIterator last, - match_results<BidiIterator, Allocator>& m, - const u32regex& e, +inline bool u32regex_match(BidiIterator first, BidiIterator last, + match_results<BidiIterator, Allocator>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_match(first, last, m, e, flags, static_cast<mpl::int_<sizeof(*first)> const*>(0)); } -inline bool u32regex_match(const UChar* p, - match_results<const UChar*>& m, - const u32regex& e, +inline bool u32regex_match(const UChar* p, + match_results<const UChar*>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_match(p, p+u_strlen(p), m, e, flags, static_cast<mpl::int_<2> const*>(0)); } #if !defined(U_WCHAR_IS_UTF16) && (U_SIZEOF_WCHAR_T != 2) && !defined(BOOST_NO_WREGEX) -inline bool u32regex_match(const wchar_t* p, - match_results<const wchar_t*>& m, - const u32regex& e, +inline bool u32regex_match(const wchar_t* p, + match_results<const wchar_t*>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_match(p, p+std::wcslen(p), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0)); } #endif -inline bool u32regex_match(const char* p, - match_results<const char*>& m, - const u32regex& e, +inline bool u32regex_match(const char* p, + match_results<const char*>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_match(p, p+std::strlen(p), m, e, flags, static_cast<mpl::int_<1> const*>(0)); } -inline bool u32regex_match(const unsigned char* p, - match_results<const unsigned char*>& m, - const u32regex& e, +inline bool u32regex_match(const unsigned char* p, + match_results<const unsigned char*>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_match(p, p+std::strlen((const char*)p), m, e, flags, static_cast<mpl::int_<1> const*>(0)); } -inline bool u32regex_match(const std::string& s, - match_results<std::string::const_iterator>& m, - const u32regex& e, +inline bool u32regex_match(const std::string& s, + match_results<std::string::const_iterator>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_match(s.begin(), s.end(), m, e, flags, static_cast<mpl::int_<1> const*>(0)); } #ifndef BOOST_NO_STD_WSTRING -inline bool u32regex_match(const std::wstring& s, - match_results<std::wstring::const_iterator>& m, - const u32regex& e, +inline bool u32regex_match(const std::wstring& s, + match_results<std::wstring::const_iterator>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_match(s.begin(), s.end(), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0)); } #endif -inline bool u32regex_match(const U_NAMESPACE_QUALIFIER UnicodeString& s, - match_results<const UChar*>& m, - const u32regex& e, +inline bool u32regex_match(const U_NAMESPACE_QUALIFIER UnicodeString& s, + match_results<const UChar*>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_match(s.getBuffer(), s.getBuffer() + s.length(), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0)); @@ -513,61 +513,61 @@ inline bool u32regex_match(const U_NAMESPACE_QUALIFIER UnicodeString& s, // regex_match overloads that do not return what matched: // template <class BidiIterator> -inline bool u32regex_match(BidiIterator first, BidiIterator last, - const u32regex& e, +inline bool u32regex_match(BidiIterator first, BidiIterator last, + const u32regex& e, match_flag_type flags = match_default) { match_results<BidiIterator> m; return re_detail::do_regex_match(first, last, m, e, flags, static_cast<mpl::int_<sizeof(*first)> const*>(0)); } -inline bool u32regex_match(const UChar* p, - const u32regex& e, +inline bool u32regex_match(const UChar* p, + const u32regex& e, match_flag_type flags = match_default) { match_results<const UChar*> m; return re_detail::do_regex_match(p, p+u_strlen(p), m, e, flags, static_cast<mpl::int_<2> const*>(0)); } #if !defined(U_WCHAR_IS_UTF16) && (U_SIZEOF_WCHAR_T != 2) && !defined(BOOST_NO_WREGEX) -inline bool u32regex_match(const wchar_t* p, - const u32regex& e, +inline bool u32regex_match(const wchar_t* p, + const u32regex& e, match_flag_type flags = match_default) { match_results<const wchar_t*> m; return re_detail::do_regex_match(p, p+std::wcslen(p), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0)); } #endif -inline bool u32regex_match(const char* p, - const u32regex& e, +inline bool u32regex_match(const char* p, + const u32regex& e, match_flag_type flags = match_default) { match_results<const char*> m; return re_detail::do_regex_match(p, p+std::strlen(p), m, e, flags, static_cast<mpl::int_<1> const*>(0)); } -inline bool u32regex_match(const unsigned char* p, - const u32regex& e, +inline bool u32regex_match(const unsigned char* p, + const u32regex& e, match_flag_type flags = match_default) { match_results<const unsigned char*> m; return re_detail::do_regex_match(p, p+std::strlen((const char*)p), m, e, flags, static_cast<mpl::int_<1> const*>(0)); } -inline bool u32regex_match(const std::string& s, - const u32regex& e, +inline bool u32regex_match(const std::string& s, + const u32regex& e, match_flag_type flags = match_default) { match_results<std::string::const_iterator> m; return re_detail::do_regex_match(s.begin(), s.end(), m, e, flags, static_cast<mpl::int_<1> const*>(0)); } #ifndef BOOST_NO_STD_WSTRING -inline bool u32regex_match(const std::wstring& s, - const u32regex& e, +inline bool u32regex_match(const std::wstring& s, + const u32regex& e, match_flag_type flags = match_default) { match_results<std::wstring::const_iterator> m; return re_detail::do_regex_match(s.begin(), s.end(), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0)); } #endif -inline bool u32regex_match(const U_NAMESPACE_QUALIFIER UnicodeString& s, - const u32regex& e, +inline bool u32regex_match(const U_NAMESPACE_QUALIFIER UnicodeString& s, + const u32regex& e, match_flag_type flags = match_default) { match_results<const UChar*> m; @@ -579,9 +579,9 @@ inline bool u32regex_match(const U_NAMESPACE_QUALIFIER UnicodeString& s, // namespace re_detail{ template <class BidiIterator, class Allocator> -inline bool do_regex_search(BidiIterator first, BidiIterator last, - match_results<BidiIterator, Allocator>& m, - const u32regex& e, +inline bool do_regex_search(BidiIterator first, BidiIterator last, + match_results<BidiIterator, Allocator>& m, + const u32regex& e, match_flag_type flags, BidiIterator base, boost::mpl::int_<4> const*) @@ -589,9 +589,9 @@ inline bool do_regex_search(BidiIterator first, BidiIterator last, return ::boost::regex_search(first, last, m, e, flags, base); } template <class BidiIterator, class Allocator> -bool do_regex_search(BidiIterator first, BidiIterator last, - match_results<BidiIterator, Allocator>& m, - const u32regex& e, +bool do_regex_search(BidiIterator first, BidiIterator last, + match_results<BidiIterator, Allocator>& m, + const u32regex& e, match_flag_type flags, BidiIterator base, boost::mpl::int_<2> const*) @@ -606,9 +606,9 @@ bool do_regex_search(BidiIterator first, BidiIterator last, return result; } template <class BidiIterator, class Allocator> -bool do_regex_search(BidiIterator first, BidiIterator last, - match_results<BidiIterator, Allocator>& m, - const u32regex& e, +bool do_regex_search(BidiIterator first, BidiIterator last, + match_results<BidiIterator, Allocator>& m, + const u32regex& e, match_flag_type flags, BidiIterator base, boost::mpl::int_<1> const*) @@ -625,131 +625,131 @@ bool do_regex_search(BidiIterator first, BidiIterator last, } template <class BidiIterator, class Allocator> -inline bool u32regex_search(BidiIterator first, BidiIterator last, - match_results<BidiIterator, Allocator>& m, - const u32regex& e, +inline bool u32regex_search(BidiIterator first, BidiIterator last, + match_results<BidiIterator, Allocator>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_search(first, last, m, e, flags, first, static_cast<mpl::int_<sizeof(*first)> const*>(0)); } template <class BidiIterator, class Allocator> -inline bool u32regex_search(BidiIterator first, BidiIterator last, - match_results<BidiIterator, Allocator>& m, - const u32regex& e, +inline bool u32regex_search(BidiIterator first, BidiIterator last, + match_results<BidiIterator, Allocator>& m, + const u32regex& e, match_flag_type flags, BidiIterator base) { return re_detail::do_regex_search(first, last, m, e, flags, base, static_cast<mpl::int_<sizeof(*first)> const*>(0)); } -inline bool u32regex_search(const UChar* p, - match_results<const UChar*>& m, - const u32regex& e, +inline bool u32regex_search(const UChar* p, + match_results<const UChar*>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_search(p, p+u_strlen(p), m, e, flags, p, static_cast<mpl::int_<2> const*>(0)); } #if !defined(U_WCHAR_IS_UTF16) && (U_SIZEOF_WCHAR_T != 2) && !defined(BOOST_NO_WREGEX) -inline bool u32regex_search(const wchar_t* p, - match_results<const wchar_t*>& m, - const u32regex& e, +inline bool u32regex_search(const wchar_t* p, + match_results<const wchar_t*>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_search(p, p+std::wcslen(p), m, e, flags, p, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0)); } #endif -inline bool u32regex_search(const char* p, - match_results<const char*>& m, - const u32regex& e, +inline bool u32regex_search(const char* p, + match_results<const char*>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_search(p, p+std::strlen(p), m, e, flags, p, static_cast<mpl::int_<1> const*>(0)); } -inline bool u32regex_search(const unsigned char* p, - match_results<const unsigned char*>& m, - const u32regex& e, +inline bool u32regex_search(const unsigned char* p, + match_results<const unsigned char*>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_search(p, p+std::strlen((const char*)p), m, e, flags, p, static_cast<mpl::int_<1> const*>(0)); } -inline bool u32regex_search(const std::string& s, - match_results<std::string::const_iterator>& m, - const u32regex& e, +inline bool u32regex_search(const std::string& s, + match_results<std::string::const_iterator>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_search(s.begin(), s.end(), m, e, flags, s.begin(), static_cast<mpl::int_<1> const*>(0)); } #ifndef BOOST_NO_STD_WSTRING -inline bool u32regex_search(const std::wstring& s, - match_results<std::wstring::const_iterator>& m, - const u32regex& e, +inline bool u32regex_search(const std::wstring& s, + match_results<std::wstring::const_iterator>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_search(s.begin(), s.end(), m, e, flags, s.begin(), static_cast<mpl::int_<sizeof(wchar_t)> const*>(0)); } #endif -inline bool u32regex_search(const U_NAMESPACE_QUALIFIER UnicodeString& s, - match_results<const UChar*>& m, - const u32regex& e, +inline bool u32regex_search(const U_NAMESPACE_QUALIFIER UnicodeString& s, + match_results<const UChar*>& m, + const u32regex& e, match_flag_type flags = match_default) { return re_detail::do_regex_search(s.getBuffer(), s.getBuffer() + s.length(), m, e, flags, s.getBuffer(), static_cast<mpl::int_<sizeof(wchar_t)> const*>(0)); } template <class BidiIterator> -inline bool u32regex_search(BidiIterator first, BidiIterator last, - const u32regex& e, +inline bool u32regex_search(BidiIterator first, BidiIterator last, + const u32regex& e, match_flag_type flags = match_default) { match_results<BidiIterator> m; return re_detail::do_regex_search(first, last, m, e, flags, first, static_cast<mpl::int_<sizeof(*first)> const*>(0)); } -inline bool u32regex_search(const UChar* p, - const u32regex& e, +inline bool u32regex_search(const UChar* p, + const u32regex& e, match_flag_type flags = match_default) { match_results<const UChar*> m; return re_detail::do_regex_search(p, p+u_strlen(p), m, e, flags, p, static_cast<mpl::int_<2> const*>(0)); } #if !defined(U_WCHAR_IS_UTF16) && (U_SIZEOF_WCHAR_T != 2) && !defined(BOOST_NO_WREGEX) -inline bool u32regex_search(const wchar_t* p, - const u32regex& e, +inline bool u32regex_search(const wchar_t* p, + const u32regex& e, match_flag_type flags = match_default) { match_results<const wchar_t*> m; return re_detail::do_regex_search(p, p+std::wcslen(p), m, e, flags, p, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0)); } #endif -inline bool u32regex_search(const char* p, - const u32regex& e, +inline bool u32regex_search(const char* p, + const u32regex& e, match_flag_type flags = match_default) { match_results<const char*> m; return re_detail::do_regex_search(p, p+std::strlen(p), m, e, flags, p, static_cast<mpl::int_<1> const*>(0)); } -inline bool u32regex_search(const unsigned char* p, - const u32regex& e, +inline bool u32regex_search(const unsigned char* p, + const u32regex& e, match_flag_type flags = match_default) { match_results<const unsigned char*> m; return re_detail::do_regex_search(p, p+std::strlen((const char*)p), m, e, flags, p, static_cast<mpl::int_<1> const*>(0)); } -inline bool u32regex_search(const std::string& s, - const u32regex& e, +inline bool u32regex_search(const std::string& s, + const u32regex& e, match_flag_type flags = match_default) { match_results<std::string::const_iterator> m; return re_detail::do_regex_search(s.begin(), s.end(), m, e, flags, s.begin(), static_cast<mpl::int_<1> const*>(0)); } #ifndef BOOST_NO_STD_WSTRING -inline bool u32regex_search(const std::wstring& s, - const u32regex& e, +inline bool u32regex_search(const std::wstring& s, + const u32regex& e, match_flag_type flags = match_default) { match_results<std::wstring::const_iterator> m; return re_detail::do_regex_search(s.begin(), s.end(), m, e, flags, s.begin(), static_cast<mpl::int_<sizeof(wchar_t)> const*>(0)); } #endif -inline bool u32regex_search(const U_NAMESPACE_QUALIFIER UnicodeString& s, - const u32regex& e, +inline bool u32regex_search(const U_NAMESPACE_QUALIFIER UnicodeString& s, + const u32regex& e, match_flag_type flags = match_default) { match_results<const UChar*> m; @@ -817,8 +817,8 @@ inline utf8_output_iterator<OutputIterator> make_utf32_out(OutputIterator o, mpl template <class OutputIterator, class I1, class I2> OutputIterator do_regex_replace(OutputIterator out, std::pair<I1, I1> const& in, - const u32regex& e, - const std::pair<I2, I2>& fmt, + const u32regex& e, + const std::pair<I2, I2>& fmt, match_flag_type flags ) { @@ -832,7 +832,7 @@ OutputIterator do_regex_replace(OutputIterator out, while(pos != fmt.second) f.push_back(*pos++); #endif - + regex_iterator<I1, UChar32, icu_regex_traits> i(in.first, in.second, e, flags); regex_iterator<I1, UChar32, icu_regex_traits> j; if(i == j) @@ -846,7 +846,7 @@ OutputIterator do_regex_replace(OutputIterator out, while(i != j) { if(!(flags & regex_constants::format_no_copy)) - out = re_detail::copy(i->prefix().first, i->prefix().second, out); + out = re_detail::copy(i->prefix().first, i->prefix().second, out); if(f.size()) out = ::boost::re_detail::regex_format_imp(out, *i, &*f.begin(), &*f.begin() + f.size(), flags, e.get_traits()); else @@ -882,8 +882,8 @@ template <class OutputIterator, class BidirectionalIterator, class charT> inline OutputIterator u32regex_replace(OutputIterator out, BidirectionalIterator first, BidirectionalIterator last, - const u32regex& e, - const charT* fmt, + const u32regex& e, + const charT* fmt, match_flag_type flags = match_default) { return re_detail::extract_output_base @@ -904,7 +904,7 @@ template <class OutputIterator, class Iterator, class charT> inline OutputIterator u32regex_replace(OutputIterator out, Iterator first, Iterator last, - const u32regex& e, + const u32regex& e, const std::basic_string<charT>& fmt, match_flag_type flags = match_default) { @@ -926,7 +926,7 @@ template <class OutputIterator, class Iterator> inline OutputIterator u32regex_replace(OutputIterator out, Iterator first, Iterator last, - const u32regex& e, + const u32regex& e, const U_NAMESPACE_QUALIFIER UnicodeString& fmt, match_flag_type flags = match_default) { @@ -946,7 +946,7 @@ inline OutputIterator u32regex_replace(OutputIterator out, template <class charT> std::basic_string<charT> u32regex_replace(const std::basic_string<charT>& s, - const u32regex& e, + const u32regex& e, const charT* fmt, match_flag_type flags = match_default) { @@ -958,7 +958,7 @@ std::basic_string<charT> u32regex_replace(const std::basic_string<charT>& s, template <class charT> std::basic_string<charT> u32regex_replace(const std::basic_string<charT>& s, - const u32regex& e, + const u32regex& e, const std::basic_string<charT>& fmt, match_flag_type flags = match_default) { @@ -978,10 +978,10 @@ public: unicode_string_out_iterator& operator++() { return *this; } unicode_string_out_iterator& operator++(int) { return *this; } unicode_string_out_iterator& operator*() { return *this; } - unicode_string_out_iterator& operator=(UChar v) - { - *out += v; - return *this; + unicode_string_out_iterator& operator=(UChar v) + { + *out += v; + return *this; } typedef std::ptrdiff_t difference_type; typedef UChar value_type; @@ -993,7 +993,7 @@ public: } inline U_NAMESPACE_QUALIFIER UnicodeString u32regex_replace(const U_NAMESPACE_QUALIFIER UnicodeString& s, - const u32regex& e, + const u32regex& e, const UChar* fmt, match_flag_type flags = match_default) { @@ -1004,7 +1004,7 @@ inline U_NAMESPACE_QUALIFIER UnicodeString u32regex_replace(const U_NAMESPACE_QU } inline U_NAMESPACE_QUALIFIER UnicodeString u32regex_replace(const U_NAMESPACE_QUALIFIER UnicodeString& s, - const u32regex& e, + const u32regex& e, const U_NAMESPACE_QUALIFIER UnicodeString& fmt, match_flag_type flags = match_default) { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/pending/object_cache.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/pending/object_cache.hpp index 8346166d..d47fbba9 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/pending/object_cache.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/pending/object_cache.hpp @@ -3,8 +3,8 @@ * Copyright (c) 2004 * John Maddock * - * Use, modification and distribution are subject to the - * Boost Software License, Version 1.0. (See accompanying file + * Use, modification and distribution are subject to the + * Boost Software License, Version 1.0. (See accompanying file * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * */ @@ -24,7 +24,7 @@ #include <stdexcept> #include <string> #include <boost/config.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #ifdef BOOST_HAS_THREADS #include <boost/regex/pending/static_mutex.hpp> #endif @@ -35,16 +35,16 @@ template <class Key, class Object> class object_cache { public: - typedef std::pair< ::boost::std::shared_ptr<Object const>, Key const*> value_type; + typedef std::pair< ::boost::shared_ptr<Object const>, Key const*> value_type; typedef std::list<value_type> list_type; typedef typename list_type::iterator list_iterator; typedef std::map<Key, list_iterator> map_type; typedef typename map_type::iterator map_iterator; typedef typename list_type::size_type size_type; - static boost::std::shared_ptr<Object const> get(const Key& k, size_type l_max_cache_size); + static boost::shared_ptr<Object const> get(const Key& k, size_type l_max_cache_size); private: - static boost::std::shared_ptr<Object const> do_get(const Key& k, size_type l_max_cache_size); + static boost::shared_ptr<Object const> do_get(const Key& k, size_type l_max_cache_size); struct data { @@ -58,7 +58,7 @@ private: }; template <class Key, class Object> -boost::std::shared_ptr<Object const> object_cache<Key, Object>::get(const Key& k, size_type l_max_cache_size) +boost::shared_ptr<Object const> object_cache<Key, Object>::get(const Key& k, size_type l_max_cache_size) { #ifdef BOOST_HAS_THREADS static boost::static_mutex mut = BOOST_STATIC_MUTEX_INIT; @@ -74,7 +74,7 @@ boost::std::shared_ptr<Object const> object_cache<Key, Object>::get(const Key& k // ::boost::throw_exception(std::runtime_error("Error in thread safety code: could not acquire a lock")); #if defined(BOOST_NO_UNREACHABLE_RETURN_DETECTION) || defined(BOOST_NO_EXCEPTIONS) - return boost::std::shared_ptr<Object>(); + return boost::shared_ptr<Object>(); #endif #else return do_get(k, l_max_cache_size); @@ -82,7 +82,7 @@ boost::std::shared_ptr<Object const> object_cache<Key, Object>::get(const Key& k } template <class Key, class Object> -boost::std::shared_ptr<Object const> object_cache<Key, Object>::do_get(const Key& k, size_type l_max_cache_size) +boost::shared_ptr<Object const> object_cache<Key, Object>::do_get(const Key& k, size_type l_max_cache_size) { typedef typename object_cache<Key, Object>::data object_data; typedef typename map_type::size_type map_size_type; @@ -95,7 +95,7 @@ boost::std::shared_ptr<Object const> object_cache<Key, Object>::do_get(const Key if(mpos != s_data.index.end()) { // - // Eureka! + // Eureka! // We have a cached item, bump it up the list and return it: // if(--(s_data.cont.end()) != mpos->second) @@ -117,7 +117,7 @@ boost::std::shared_ptr<Object const> object_cache<Key, Object>::do_get(const Key // if we get here then the item is not in the cache, // so create it: // - boost::std::shared_ptr<Object const> result(new Object(k)); + boost::shared_ptr<Object const> result(new Object(k)); // // Add it to the list, and index it: // @@ -143,11 +143,11 @@ boost::std::shared_ptr<Object const> object_cache<Key, Object>::do_get(const Key { list_iterator condemmed(pos); ++pos; - // now remove the items from our containers, + // now remove the items from our containers, // then order has to be as follows: BOOST_ASSERT(s_data.index.find(*(condemmed->second)) != s_data.index.end()); s_data.index.erase(*(condemmed->second)); - s_data.cont.erase(condemmed); + s_data.cont.erase(condemmed); --s; } else diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/basic_regex.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/basic_regex.hpp index 7d70105d..0b63e3aa 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/basic_regex.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/basic_regex.hpp @@ -80,13 +80,13 @@ public: { template <class charT> name(const charT* i, const charT* j, int idx) - : index(idx) - { - hash = hash_value_from_capture_name(i, j); + : index(idx) + { + hash = hash_value_from_capture_name(i, j); } name(int h, int idx) : index(idx), hash(h) - { + { } int index; int hash; @@ -96,7 +96,7 @@ public: } bool operator == (const name& other)const { - return hash == other.hash; + return hash == other.hash; } void swap(name& other) { @@ -160,15 +160,15 @@ template <class charT, class traits> struct regex_data : public named_subexpressions { typedef regex_constants::syntax_option_type flag_type; - typedef std::size_t size_type; + typedef std::size_t size_type; - regex_data(const ::boost::std::shared_ptr< - ::boost::regex_traits_wrapper<traits> >& t) + regex_data(const ::boost::shared_ptr< + ::boost::regex_traits_wrapper<traits> >& t) : m_ptraits(t), m_expression(0), m_expression_len(0) {} - regex_data() + regex_data() : m_ptraits(new ::boost::regex_traits_wrapper<traits>()), m_expression(0), m_expression_len(0) {} - ::boost::std::shared_ptr< + ::boost::shared_ptr< ::boost::regex_traits_wrapper<traits> > m_ptraits; // traits class instance flag_type m_flags; // flags with which we were compiled @@ -198,12 +198,12 @@ class basic_regex_implementation public: typedef regex_constants::syntax_option_type flag_type; typedef std::ptrdiff_t difference_type; - typedef std::size_t size_type; + typedef std::size_t size_type; typedef typename traits::locale_type locale_type; typedef const charT* const_iterator; basic_regex_implementation(){} - basic_regex_implementation(const ::boost::std::shared_ptr< + basic_regex_implementation(const ::boost::shared_ptr< ::boost::regex_traits_wrapper<traits> >& t) : regex_data<charT, traits>(t) {} void assign(const charT* arg_first, @@ -216,12 +216,12 @@ public: } locale_type BOOST_REGEX_CALL imbue(locale_type l) - { - return this->m_ptraits->imbue(l); + { + return this->m_ptraits->imbue(l); } locale_type BOOST_REGEX_CALL getloc()const - { - return this->m_ptraits->getloc(); + { + return this->m_ptraits->getloc(); } std::basic_string<charT> BOOST_REGEX_CALL str()const { @@ -245,12 +245,12 @@ public: // // begin, end: const_iterator BOOST_REGEX_CALL begin()const - { - return (this->m_status ? 0 : this->m_expression); + { + return (this->m_status ? 0 : this->m_expression); } const_iterator BOOST_REGEX_CALL end()const - { - return (this->m_status ? 0 : this->m_expression + this->m_expression_len); + { + return (this->m_status ? 0 : this->m_expression + this->m_expression_len); } flag_type BOOST_REGEX_CALL flags()const { @@ -322,13 +322,13 @@ public: typedef const charT* const_iterator; typedef const_iterator iterator; typedef std::ptrdiff_t difference_type; - typedef std::size_t size_type; + typedef std::size_t size_type; typedef regex_constants::syntax_option_type flag_type; // locale_type // placeholder for actual locale type used by the // traits class to localise *this. typedef typename traits::locale_type locale_type; - + public: explicit basic_regex(){} explicit basic_regex(const charT* p, flag_type f = regex_constants::normal) @@ -358,9 +358,9 @@ public: // // assign: basic_regex& assign(const basic_regex& that) - { + { m_pimpl = that.m_pimpl; - return *this; + return *this; } basic_regex& assign(const charT* p, flag_type f = regex_constants::normal) { @@ -385,14 +385,14 @@ public: template <class ST, class SA> unsigned int BOOST_REGEX_CALL set_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal) - { - return set_expression(p.data(), p.data() + p.size(), f); + { + return set_expression(p.data(), p.data() + p.size(), f); } template <class ST, class SA> explicit basic_regex(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal) - { - assign(p, f); + { + assign(p, f); } template <class InputIterator> @@ -437,13 +437,13 @@ public: } #else unsigned int BOOST_REGEX_CALL set_expression(const std::basic_string<charT>& p, flag_type f = regex_constants::normal) - { - return set_expression(p.data(), p.data() + p.size(), f); + { + return set_expression(p.data(), p.data() + p.size(), f); } basic_regex(const std::basic_string<charT>& p, flag_type f = regex_constants::normal) - { - assign(p, f); + { + assign(p, f); } basic_regex& BOOST_REGEX_CALL operator=(const std::basic_string<charT>& p) @@ -464,19 +464,19 @@ public: // locale: locale_type BOOST_REGEX_CALL imbue(locale_type l); locale_type BOOST_REGEX_CALL getloc()const - { - return m_pimpl.get() ? m_pimpl->getloc() : locale_type(); + { + return m_pimpl.get() ? m_pimpl->getloc() : locale_type(); } // // getflags: // retained for backwards compatibility only, "flags" // is now the preferred name: flag_type BOOST_REGEX_CALL getflags()const - { + { return flags(); } flag_type BOOST_REGEX_CALL flags()const - { + { return m_pimpl.get() ? m_pimpl->flags() : 0; } // @@ -494,12 +494,12 @@ public: return m_pimpl->subexpression(n); } const_iterator BOOST_REGEX_CALL begin()const - { - return (m_pimpl.get() ? m_pimpl->begin() : 0); + { + return (m_pimpl.get() ? m_pimpl->begin() : 0); } const_iterator BOOST_REGEX_CALL end()const - { - return (m_pimpl.get() ? m_pimpl->end() : 0); + { + return (m_pimpl.get() ? m_pimpl->end() : 0); } // // swap: @@ -510,25 +510,25 @@ public: // // size: size_type BOOST_REGEX_CALL size()const - { - return (m_pimpl.get() ? m_pimpl->size() : 0); + { + return (m_pimpl.get() ? m_pimpl->size() : 0); } // // max_size: size_type BOOST_REGEX_CALL max_size()const - { - return UINT_MAX; + { + return UINT_MAX; } // // empty: bool BOOST_REGEX_CALL empty()const - { - return (m_pimpl.get() ? 0 != m_pimpl->status() : true); + { + return (m_pimpl.get() ? 0 != m_pimpl->status() : true); } - size_type BOOST_REGEX_CALL mark_count()const - { - return (m_pimpl.get() ? m_pimpl->mark_count() : 0); + size_type BOOST_REGEX_CALL mark_count()const + { + return (m_pimpl.get() ? m_pimpl->mark_count() : 0); } int status()const @@ -551,45 +551,45 @@ public: return str().compare(that.str()); } bool BOOST_REGEX_CALL operator==(const basic_regex& e)const - { - return compare(e) == 0; + { + return compare(e) == 0; } bool BOOST_REGEX_CALL operator != (const basic_regex& e)const - { - return compare(e) != 0; + { + return compare(e) != 0; } bool BOOST_REGEX_CALL operator<(const basic_regex& e)const - { - return compare(e) < 0; + { + return compare(e) < 0; } bool BOOST_REGEX_CALL operator>(const basic_regex& e)const - { - return compare(e) > 0; + { + return compare(e) > 0; } bool BOOST_REGEX_CALL operator<=(const basic_regex& e)const - { - return compare(e) <= 0; + { + return compare(e) <= 0; } bool BOOST_REGEX_CALL operator>=(const basic_regex& e)const - { - return compare(e) >= 0; + { + return compare(e) >= 0; } // // The following are deprecated as public interfaces // but are available for compatibility with earlier versions. - const charT* BOOST_REGEX_CALL expression()const - { - return (m_pimpl.get() && !m_pimpl->status() ? m_pimpl->expression() : 0); + const charT* BOOST_REGEX_CALL expression()const + { + return (m_pimpl.get() && !m_pimpl->status() ? m_pimpl->expression() : 0); } unsigned int BOOST_REGEX_CALL set_expression(const charT* p1, const charT* p2, flag_type f = regex_constants::normal) { assign(p1, p2, f | regex_constants::no_except); return status(); } - unsigned int BOOST_REGEX_CALL set_expression(const charT* p, flag_type f = regex_constants::normal) - { - assign(p, f | regex_constants::no_except); + unsigned int BOOST_REGEX_CALL set_expression(const charT* p, flag_type f = regex_constants::normal) + { + assign(p, f | regex_constants::no_except); return status(); } unsigned int BOOST_REGEX_CALL error_code()const @@ -629,13 +629,13 @@ public: BOOST_ASSERT(0 != m_pimpl.get()); return m_pimpl->get_data(); } - boost::std::shared_ptr<re_detail::named_subexpressions > get_named_subs()const + boost::shared_ptr<re_detail::named_subexpressions > get_named_subs()const { return m_pimpl; } private: - std::shared_ptr<re_detail::basic_regex_implementation<charT, traits> > m_pimpl; + shared_ptr<re_detail::basic_regex_implementation<charT, traits> > m_pimpl; }; // @@ -649,14 +649,14 @@ basic_regex<charT, traits>& basic_regex<charT, traits>::do_assign(const charT* p const charT* p2, flag_type f) { - std::shared_ptr<re_detail::basic_regex_implementation<charT, traits> > temp; + shared_ptr<re_detail::basic_regex_implementation<charT, traits> > temp; if(!m_pimpl.get()) { - temp = std::shared_ptr<re_detail::basic_regex_implementation<charT, traits> >(new re_detail::basic_regex_implementation<charT, traits>()); + temp = shared_ptr<re_detail::basic_regex_implementation<charT, traits> >(new re_detail::basic_regex_implementation<charT, traits>()); } else { - temp = std::shared_ptr<re_detail::basic_regex_implementation<charT, traits> >(new re_detail::basic_regex_implementation<charT, traits>(m_pimpl->m_ptraits)); + temp = shared_ptr<re_detail::basic_regex_implementation<charT, traits> >(new re_detail::basic_regex_implementation<charT, traits>(m_pimpl->m_ptraits)); } temp->assign(p1, p2, f); temp.swap(m_pimpl); @@ -665,8 +665,8 @@ basic_regex<charT, traits>& basic_regex<charT, traits>::do_assign(const charT* p template <class charT, class traits> typename basic_regex<charT, traits>::locale_type BOOST_REGEX_CALL basic_regex<charT, traits>::imbue(locale_type l) -{ - std::shared_ptr<re_detail::basic_regex_implementation<charT, traits> > temp(new re_detail::basic_regex_implementation<charT, traits>()); +{ + shared_ptr<re_detail::basic_regex_implementation<charT, traits> > temp(new re_detail::basic_regex_implementation<charT, traits>()); locale_type result = temp->imbue(l); temp.swap(m_pimpl); return result; @@ -683,8 +683,8 @@ void swap(basic_regex<charT, traits>& e1, basic_regex<charT, traits>& e2) #ifndef BOOST_NO_STD_LOCALE template <class charT, class traits, class traits2> -std::basic_ostream<charT, traits>& - operator << (std::basic_ostream<charT, traits>& os, +std::basic_ostream<charT, traits>& + operator << (std::basic_ostream<charT, traits>& os, const basic_regex<charT, traits2>& e) { return (os << e.str()); @@ -731,7 +731,7 @@ public: template <class ST, class SA> explicit reg_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal) : basic_regex<charT, traits>(p, f) - { + { } template <class InputIterator> @@ -749,7 +749,7 @@ public: #else explicit reg_expression(const std::basic_string<charT>& p, flag_type f = regex_constants::normal) : basic_regex<charT, traits>(p, f) - { + { } reg_expression& BOOST_REGEX_CALL operator=(const std::basic_string<charT>& p) diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/cpp_regex_traits.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/cpp_regex_traits.hpp index 17fe2b63..d60942f0 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/cpp_regex_traits.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/cpp_regex_traits.hpp @@ -3,12 +3,12 @@ * Copyright (c) 2004 John Maddock * Copyright 2011 Garmin Ltd. or its subsidiaries * - * Use, modification and distribution are subject to the - * Boost Software License, Version 1.0. (See accompanying file + * Use, modification and distribution are subject to the + * Boost Software License, Version 1.0. (See accompanying file * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * */ - + /* * LOCATION: see http://www.boost.org for most recent version. * FILE cpp_regex_traits.hpp @@ -60,14 +60,14 @@ #pragma warning(disable:4786 4251) #endif -namespace boost{ +namespace boost{ // // forward declaration is needed by some compilers: // template <class charT> class cpp_regex_traits; - + namespace re_detail{ // @@ -201,9 +201,9 @@ struct cpp_regex_traits_base } bool operator==(const cpp_regex_traits_base& b)const { - return (m_pctype == b.m_pctype) + return (m_pctype == b.m_pctype) #ifndef BOOST_NO_STD_MESSAGES - && (m_pmessages == b.m_pmessages) + && (m_pmessages == b.m_pmessages) #endif && (m_pcollate == b.m_pcollate); } @@ -283,7 +283,7 @@ void cpp_regex_traits_char_layer<charT>::init() if(cat_name.size() && (this->m_pmessages != 0)) { cat = this->m_pmessages->open( - cat_name, + cat_name, this->m_locale); if((int)cat < 0) { @@ -337,7 +337,7 @@ void cpp_regex_traits_char_layer<charT>::init() } template <class charT> -typename cpp_regex_traits_char_layer<charT>::string_type +typename cpp_regex_traits_char_layer<charT>::string_type cpp_regex_traits_char_layer<charT>::get_default_message(regex_constants::syntax_type i) { const char* ptr = get_default_syntax(i); @@ -386,16 +386,16 @@ private: #ifdef BOOST_REGEX_BUGGY_CTYPE_FACET enum { - char_class_space=1<<0, - char_class_print=1<<1, - char_class_cntrl=1<<2, - char_class_upper=1<<3, + char_class_space=1<<0, + char_class_print=1<<1, + char_class_cntrl=1<<2, + char_class_upper=1<<3, char_class_lower=1<<4, - char_class_alpha=1<<5, - char_class_digit=1<<6, - char_class_punct=1<<7, + char_class_alpha=1<<5, + char_class_digit=1<<6, + char_class_punct=1<<7, char_class_xdigit=1<<8, - char_class_alnum=char_class_alpha|char_class_digit, + char_class_alnum=char_class_alpha|char_class_digit, char_class_graph=char_class_alnum|char_class_punct, char_class_blank=1<<9, char_class_word=1<<10, @@ -495,14 +495,14 @@ typename cpp_regex_traits_implementation<charT>::char_class_type const cpp_regex #endif template <class charT> -typename cpp_regex_traits_implementation<charT>::string_type +typename cpp_regex_traits_implementation<charT>::string_type cpp_regex_traits_implementation<charT>::transform_primary(const charT* p1, const charT* p2) const { // // PRECONDITIONS: // // A bug in gcc 3.2 (and maybe other versions as well) treats - // p1 as a null terminated string, for efficiency reasons + // p1 as a null terminated string, for efficiency reasons // we work around this elsewhere, but just assert here that // we adhere to gcc's (buggy) preconditions... // @@ -565,14 +565,14 @@ typename cpp_regex_traits_implementation<charT>::string_type } template <class charT> -typename cpp_regex_traits_implementation<charT>::string_type +typename cpp_regex_traits_implementation<charT>::string_type cpp_regex_traits_implementation<charT>::transform(const charT* p1, const charT* p2) const { // // PRECONDITIONS: // // A bug in gcc 3.2 (and maybe other versions as well) treats - // p1 as a null terminated string, for efficiency reasons + // p1 as a null terminated string, for efficiency reasons // we work around this elsewhere, but just assert here that // we adhere to gcc's (buggy) preconditions... // @@ -613,7 +613,7 @@ typename cpp_regex_traits_implementation<charT>::string_type template <class charT> -typename cpp_regex_traits_implementation<charT>::string_type +typename cpp_regex_traits_implementation<charT>::string_type cpp_regex_traits_implementation<charT>::lookup_collatename(const charT* p1, const charT* p2) const { typedef typename std::map<string_type, string_type>::const_iterator iter_type; @@ -669,7 +669,7 @@ void cpp_regex_traits_implementation<charT>::init() if(cat_name.size() && (this->m_pmessages != 0)) { cat = this->m_pmessages->open( - cat_name, + cat_name, this->m_locale); if((int)cat < 0) { @@ -686,8 +686,8 @@ void cpp_regex_traits_implementation<charT>::init() // // Error messages: // - for(boost::regex_constants::error_type i = static_cast<boost::regex_constants::error_type>(0); - i <= boost::regex_constants::error_unknown; + for(boost::regex_constants::error_type i = static_cast<boost::regex_constants::error_type>(0); + i <= boost::regex_constants::error_unknown; i = static_cast<boost::regex_constants::error_type>(i + 1)) { const char* p = get_default_error_string(i); @@ -709,7 +709,7 @@ void cpp_regex_traits_implementation<charT>::init() // Custom class names: // #ifndef BOOST_REGEX_BUGGY_CTYPE_FACET - static const char_class_type masks[16] = + static const char_class_type masks[16] = { std::ctype<charT>::alnum, std::ctype<charT>::alpha, @@ -729,7 +729,7 @@ void cpp_regex_traits_implementation<charT>::init() cpp_regex_traits_implementation<charT>::mask_unicode, }; #else - static const char_class_type masks[16] = + static const char_class_type masks[16] = { ::boost::re_detail::char_class_alnum, ::boost::re_detail::char_class_alpha, @@ -765,14 +765,14 @@ void cpp_regex_traits_implementation<charT>::init() } template <class charT> -typename cpp_regex_traits_implementation<charT>::char_class_type +typename cpp_regex_traits_implementation<charT>::char_class_type cpp_regex_traits_implementation<charT>::lookup_classname_imp(const charT* p1, const charT* p2) const { #ifndef BOOST_REGEX_BUGGY_CTYPE_FACET - static const char_class_type masks[22] = + static const char_class_type masks[22] = { 0, - std::ctype<char>::alnum, + std::ctype<char>::alnum, std::ctype<char>::alpha, cpp_regex_traits_implementation<charT>::mask_blank, std::ctype<char>::cntrl, @@ -790,15 +790,15 @@ typename cpp_regex_traits_implementation<charT>::char_class_type cpp_regex_traits_implementation<charT>::mask_unicode, std::ctype<char>::upper, cpp_regex_traits_implementation<charT>::mask_vertical, - std::ctype<char>::alnum | cpp_regex_traits_implementation<charT>::mask_word, - std::ctype<char>::alnum | cpp_regex_traits_implementation<charT>::mask_word, + std::ctype<char>::alnum | cpp_regex_traits_implementation<charT>::mask_word, + std::ctype<char>::alnum | cpp_regex_traits_implementation<charT>::mask_word, std::ctype<char>::xdigit, }; #else - static const char_class_type masks[22] = + static const char_class_type masks[22] = { 0, - ::boost::re_detail::char_class_alnum, + ::boost::re_detail::char_class_alnum, ::boost::re_detail::char_class_alpha, ::boost::re_detail::char_class_blank, ::boost::re_detail::char_class_cntrl, @@ -816,8 +816,8 @@ typename cpp_regex_traits_implementation<charT>::char_class_type ::boost::re_detail::char_class_unicode, ::boost::re_detail::char_class_upper, ::boost::re_detail::char_class_vertical_space, - ::boost::re_detail::char_class_alnum | ::boost::re_detail::char_class_word, - ::boost::re_detail::char_class_alnum | ::boost::re_detail::char_class_word, + ::boost::re_detail::char_class_alnum | ::boost::re_detail::char_class_word, + ::boost::re_detail::char_class_alnum | ::boost::re_detail::char_class_word, ::boost::re_detail::char_class_xdigit, }; #endif @@ -857,7 +857,7 @@ bool cpp_regex_traits_implementation<charT>::isctype(const charT c, char_class_t template <class charT> -inline boost::std::shared_ptr<const cpp_regex_traits_implementation<charT> > create_cpp_regex_traits(const std::locale& l BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(charT)) +inline boost::shared_ptr<const cpp_regex_traits_implementation<charT> > create_cpp_regex_traits(const std::locale& l BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(charT)) { cpp_regex_traits_base<charT> key(l); return ::boost::object_cache<cpp_regex_traits_base<charT>, cpp_regex_traits_implementation<charT> >::get(key, 5); @@ -935,9 +935,9 @@ public: #ifndef BOOST_REGEX_BUGGY_CTYPE_FACET typedef typename std::ctype<charT>::mask ctype_mask; - static const ctype_mask mask_base = + static const ctype_mask mask_base = static_cast<ctype_mask>( - std::ctype<charT>::alnum + std::ctype<charT>::alnum | std::ctype<charT>::alpha | std::ctype<charT>::cntrl | std::ctype<charT>::digit @@ -949,7 +949,7 @@ public: | std::ctype<charT>::upper | std::ctype<charT>::xdigit); - if((f & mask_base) + if((f & mask_base) && (m_pimpl->m_pctype->is( static_cast<ctype_mask>(f & mask_base), c))) return true; @@ -957,14 +957,14 @@ public: return true; else if((f & re_detail::cpp_regex_traits_implementation<charT>::mask_word) && (c == '_')) return true; - else if((f & re_detail::cpp_regex_traits_implementation<charT>::mask_blank) + else if((f & re_detail::cpp_regex_traits_implementation<charT>::mask_blank) && m_pimpl->m_pctype->is(std::ctype<charT>::space, c) && !re_detail::is_separator(c)) return true; - else if((f & re_detail::cpp_regex_traits_implementation<charT>::mask_vertical) + else if((f & re_detail::cpp_regex_traits_implementation<charT>::mask_vertical) && (::boost::re_detail::is_separator(c) || (c == '\v'))) return true; - else if((f & re_detail::cpp_regex_traits_implementation<charT>::mask_horizontal) + else if((f & re_detail::cpp_regex_traits_implementation<charT>::mask_horizontal) && this->isctype(c, std::ctype<charT>::space) && !this->isctype(c, re_detail::cpp_regex_traits_implementation<charT>::mask_vertical)) return true; return false; @@ -1001,7 +1001,7 @@ public: static std::string get_catalog_name(); private: - boost::std::shared_ptr<const re_detail::cpp_regex_traits_implementation<charT> > m_pimpl; + boost::shared_ptr<const re_detail::cpp_regex_traits_implementation<charT> > m_pimpl; // // catalog name handler: // diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/match_results.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/match_results.hpp index c5641a43..63e51175 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/match_results.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/match_results.hpp @@ -3,8 +3,8 @@ * Copyright (c) 1998-2009 * John Maddock * - * Use, modification and distribution are subject to the - * Boost Software License, Version 1.0. (See accompanying file + * Use, modification and distribution are subject to the + * Boost Software License, Version 1.0. (See accompanying file * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * */ @@ -47,14 +47,14 @@ class named_subexpressions; template <class BidiIterator, class Allocator> class match_results -{ +{ private: #ifndef BOOST_NO_STD_ALLOCATOR typedef std::vector<sub_match<BidiIterator>, Allocator> vector_type; #else typedef std::vector<sub_match<BidiIterator> > vector_type; #endif -public: +public: typedef sub_match<BidiIterator> value_type; #if !defined(BOOST_NO_STD_ALLOCATOR) && !(defined(BOOST_MSVC) && defined(_STLPORT_VERSION)) typedef typename Allocator::const_reference const_reference; @@ -81,7 +81,7 @@ public: : m_subs(), m_base(), m_last_closed_paren(0), m_is_singular(true) { (void)a; } #endif match_results(const match_results& m) - : m_subs(m.m_subs), m_named_subs(m.m_named_subs), m_last_closed_paren(m.m_last_closed_paren), m_is_singular(m.m_is_singular) + : m_subs(m.m_subs), m_named_subs(m.m_named_subs), m_last_closed_paren(m.m_last_closed_paren), m_is_singular(m.m_is_singular) { if(!m_is_singular) { @@ -547,7 +547,7 @@ public: } void BOOST_REGEX_CALL maybe_assign(const match_results<BidiIterator, Allocator>& m); - void BOOST_REGEX_CALL set_named_subs(boost::std::shared_ptr<named_sub_type> subs) + void BOOST_REGEX_CALL set_named_subs(boost::shared_ptr<named_sub_type> subs) { m_named_subs = subs; } @@ -566,7 +566,7 @@ private: vector_type m_subs; // subexpressions BidiIterator m_base; // where the search started from sub_match<BidiIterator> m_null; // a null match - boost::std::shared_ptr<named_sub_type> m_named_subs; // Shared copy of named subs in the regex object + boost::shared_ptr<named_sub_type> m_named_subs; // Shared copy of named subs in the regex object int m_last_closed_paren; // Last ) to be seen - used for formatting bool m_is_singular; // True if our stored iterators are singular }; @@ -586,7 +586,7 @@ void BOOST_REGEX_CALL match_results<BidiIterator, Allocator>::maybe_assign(const // Distances are measured from the start of *this* match, unless this isn't // a valid match in which case we use the start of the whole sequence. Note that // no subsequent match-candidate can ever be to the left of the first match found. - // This ensures that when we are using bidirectional iterators, that distances + // This ensures that when we are using bidirectional iterators, that distances // measured are as short as possible, and therefore as efficient as possible // to compute. Finally note that we don't use the "matched" data member to test // whether a sub-expression is a valid match, because partial matches set this diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/regex_iterator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/regex_iterator.hpp index c7a946d8..09e75c69 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/regex_iterator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/regex_iterator.hpp @@ -3,8 +3,8 @@ * Copyright (c) 2003 * John Maddock * - * Use, modification and distribution are subject to the - * Boost Software License, Version 1.0. (See accompanying file + * Use, modification and distribution are subject to the + * Boost Software License, Version 1.0. (See accompanying file * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * */ @@ -19,7 +19,7 @@ #ifndef BOOST_REGEX_V4_REGEX_ITERATOR_HPP #define BOOST_REGEX_V4_REGEX_ITERATOR_HPP -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> namespace boost{ @@ -34,10 +34,10 @@ namespace boost{ #pragma warning(pop) #endif -template <class BidirectionalIterator, +template <class BidirectionalIterator, class charT, class traits> -class regex_iterator_implementation +class regex_iterator_implementation { typedef basic_regex<charT, traits> regex_type; @@ -81,34 +81,34 @@ private: regex_iterator_implementation& operator=(const regex_iterator_implementation&); }; -template <class BidirectionalIterator, +template <class BidirectionalIterator, class charT = BOOST_DEDUCED_TYPENAME re_detail::regex_iterator_traits<BidirectionalIterator>::value_type, class traits = regex_traits<charT> > -class regex_iterator +class regex_iterator #ifndef BOOST_NO_STD_ITERATOR : public std::iterator< - std::forward_iterator_tag, + std::forward_iterator_tag, match_results<BidirectionalIterator>, typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type, const match_results<BidirectionalIterator>*, - const match_results<BidirectionalIterator>& > + const match_results<BidirectionalIterator>& > #endif { private: typedef regex_iterator_implementation<BidirectionalIterator, charT, traits> impl; - typedef std::shared_ptr<impl> pimpl; + typedef shared_ptr<impl> pimpl; public: typedef basic_regex<charT, traits> regex_type; typedef match_results<BidirectionalIterator> value_type; - typedef typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type + typedef typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type difference_type; typedef const value_type* pointer; - typedef const value_type& reference; + typedef const value_type& reference; typedef std::forward_iterator_tag iterator_category; - + regex_iterator(){} - regex_iterator(BidirectionalIterator a, BidirectionalIterator b, - const regex_type& re, + regex_iterator(BidirectionalIterator a, BidirectionalIterator b, + const regex_type& re, match_flag_type m = match_default) : pdata(new impl(&re, b, m)) { @@ -125,10 +125,10 @@ public: return *this; } bool operator==(const regex_iterator& that)const - { + { if((pdata.get() == 0) || (that.pdata.get() == 0)) return pdata.get() == that.pdata.get(); - return pdata->compare(*(that.pdata.get())); + return pdata->compare(*(that.pdata.get())); } bool operator!=(const regex_iterator& that)const { return !(*this == that); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/regex_token_iterator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/regex_token_iterator.hpp index d7b8da65..4e8bc36f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/regex_token_iterator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/regex_token_iterator.hpp @@ -3,8 +3,8 @@ * Copyright (c) 2003 * John Maddock * - * Use, modification and distribution are subject to the - * Boost Software License, Version 1.0. (See accompanying file + * Use, modification and distribution are subject to the + * Boost Software License, Version 1.0. (See accompanying file * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * */ @@ -19,7 +19,7 @@ #ifndef BOOST_REGEX_V4_REGEX_TOKEN_ITERATOR_HPP #define BOOST_REGEX_V4_REGEX_TOKEN_ITERATOR_HPP -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/detail/workaround.hpp> #if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\ || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \ @@ -27,7 +27,7 @@ // // Borland C++ Builder 6, and Visual C++ 6, // can't cope with the array template constructor -// so we have a template member that will accept any type as +// so we have a template member that will accept any type as // argument, and then assert that is really is an array: // #include <boost/static_assert.hpp> @@ -54,7 +54,7 @@ namespace boost{ template <class BidirectionalIterator, class charT, class traits> -class regex_token_iterator_implementation +class regex_token_iterator_implementation { typedef basic_regex<charT, traits> regex_type; typedef sub_match<BidirectionalIterator> value_type; @@ -125,11 +125,11 @@ public: bool compare(const regex_token_iterator_implementation& that) { if(this == &that) return true; - return (&re.get_data() == &that.re.get_data()) - && (end == that.end) - && (flags == that.flags) - && (N == that.N) - && (what[0].first == that.what[0].first) + return (&re.get_data() == &that.re.get_data()) + && (end == that.end) + && (flags == that.flags) + && (N == that.N) + && (what[0].first == that.what[0].first) && (what[0].second == that.what[0].second); } const value_type& get() @@ -167,40 +167,40 @@ private: regex_token_iterator_implementation& operator=(const regex_token_iterator_implementation&); }; -template <class BidirectionalIterator, +template <class BidirectionalIterator, class charT = BOOST_DEDUCED_TYPENAME re_detail::regex_iterator_traits<BidirectionalIterator>::value_type, class traits = regex_traits<charT> > -class regex_token_iterator +class regex_token_iterator #ifndef BOOST_NO_STD_ITERATOR : public std::iterator< - std::forward_iterator_tag, + std::forward_iterator_tag, sub_match<BidirectionalIterator>, typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type, const sub_match<BidirectionalIterator>*, - const sub_match<BidirectionalIterator>& > + const sub_match<BidirectionalIterator>& > #endif { private: typedef regex_token_iterator_implementation<BidirectionalIterator, charT, traits> impl; - typedef std::shared_ptr<impl> pimpl; + typedef shared_ptr<impl> pimpl; public: typedef basic_regex<charT, traits> regex_type; typedef sub_match<BidirectionalIterator> value_type; - typedef typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type + typedef typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type difference_type; typedef const value_type* pointer; - typedef const value_type& reference; + typedef const value_type& reference; typedef std::forward_iterator_tag iterator_category; - + regex_token_iterator(){} - regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, + regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, int submatch = 0, match_flag_type m = match_default) : pdata(new impl(&re, b, submatch, m)) { if(!pdata->init(a)) pdata.reset(); } - regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, + regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, const std::vector<int>& submatches, match_flag_type m = match_default) : pdata(new impl(&re, b, submatches, m)) { @@ -239,10 +239,10 @@ public: return *this; } bool operator==(const regex_token_iterator& that)const - { + { if((pdata.get() == 0) || (that.pdata.get() == 0)) return pdata.get() == that.pdata.get(); - return pdata->compare(*(that.pdata.get())); + return pdata->compare(*(that.pdata.get())); } bool operator!=(const regex_token_iterator& that)const { return !(*this == that); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/regex_workaround.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/regex_workaround.hpp index 916a4787..46a8a8d3 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/regex_workaround.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/regex_workaround.hpp @@ -3,8 +3,8 @@ * Copyright (c) 1998-2005 * John Maddock * - * Use, modification and distribution are subject to the - * Boost Software License, Version 1.0. (See accompanying file + * Use, modification and distribution are subject to the + * Boost Software License, Version 1.0. (See accompanying file * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * */ @@ -40,7 +40,7 @@ #include <boost/throw_exception.hpp> #include <boost/scoped_ptr.hpp> #include <boost/scoped_array.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/mpl/bool_fwd.hpp> #ifndef BOOST_NO_STD_LOCALE # include <locale> @@ -128,13 +128,13 @@ namespace boost{ namespace re_detail{ // // MSVC 8 will either emit warnings or else refuse to compile // code that makes perfectly legitimate use of std::copy, when - // the OutputIterator type is a user-defined class (apparently all user + // the OutputIterator type is a user-defined class (apparently all user // defined iterators are "unsafe"). This code works around that: // template<class InputIterator, class OutputIterator> inline OutputIterator copy( - InputIterator first, - InputIterator last, + InputIterator first, + InputIterator last, OutputIterator dest ) { @@ -142,8 +142,8 @@ namespace boost{ namespace re_detail{ } template<class InputIterator1, class InputIterator2> inline bool equal( - InputIterator1 first, - InputIterator1 last, + InputIterator1 first, + InputIterator1 last, InputIterator2 with ) { @@ -153,15 +153,15 @@ namespace boost{ namespace re_detail{ // // MSVC 10 will either emit warnings or else refuse to compile // code that makes perfectly legitimate use of std::copy, when - // the OutputIterator type is a user-defined class (apparently all user + // the OutputIterator type is a user-defined class (apparently all user // defined iterators are "unsafe"). What's more Microsoft have removed their // non-standard "unchecked" versions, even though their still in the MS - // documentation!! Work around this as best we can: + // documentation!! Work around this as best we can: // template<class InputIterator, class OutputIterator> inline OutputIterator copy( - InputIterator first, - InputIterator last, + InputIterator first, + InputIterator last, OutputIterator dest ) { @@ -171,8 +171,8 @@ namespace boost{ namespace re_detail{ } template<class InputIterator1, class InputIterator2> inline bool equal( - InputIterator1 first, - InputIterator1 last, + InputIterator1 first, + InputIterator1 last, InputIterator2 with ) { @@ -180,11 +180,11 @@ namespace boost{ namespace re_detail{ if(*first++ != *with++) return false; return true; } -#else - using std::copy; - using std::equal; -#endif -#if BOOST_WORKAROUND(BOOST_MSVC,>=1400) && defined(__STDC_WANT_SECURE_LIB__) && __STDC_WANT_SECURE_LIB__ +#else + using std::copy; + using std::equal; +#endif +#if BOOST_WORKAROUND(BOOST_MSVC,>=1400) && defined(__STDC_WANT_SECURE_LIB__) && __STDC_WANT_SECURE_LIB__ // use safe versions of strcpy etc: using ::strcpy_s; @@ -193,7 +193,7 @@ namespace boost{ namespace re_detail{ inline std::size_t strcpy_s( char *strDestination, std::size_t sizeInBytes, - const char *strSource + const char *strSource ) { if(std::strlen(strSource)+1 > sizeInBytes) @@ -204,7 +204,7 @@ namespace boost{ namespace re_detail{ inline std::size_t strcat_s( char *strDestination, std::size_t sizeInBytes, - const char *strSource + const char *strSource ) { if(std::strlen(strSource) + std::strlen(strDestination) + 1 > sizeInBytes) diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/u32regex_iterator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/u32regex_iterator.hpp index 450069ce..65ebd7f8 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/u32regex_iterator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/u32regex_iterator.hpp @@ -3,8 +3,8 @@ * Copyright (c) 2003 * John Maddock * - * Use, modification and distribution are subject to the - * Boost Software License, Version 1.0. (See accompanying file + * Use, modification and distribution are subject to the + * Boost Software License, Version 1.0. (See accompanying file * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * */ @@ -26,7 +26,7 @@ namespace boost{ #endif template <class BidirectionalIterator> -class u32regex_iterator_implementation +class u32regex_iterator_implementation { typedef u32regex regex_type; @@ -71,31 +71,31 @@ private: }; template <class BidirectionalIterator> -class u32regex_iterator +class u32regex_iterator #ifndef BOOST_NO_STD_ITERATOR : public std::iterator< - std::forward_iterator_tag, + std::forward_iterator_tag, match_results<BidirectionalIterator>, typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type, const match_results<BidirectionalIterator>*, - const match_results<BidirectionalIterator>& > + const match_results<BidirectionalIterator>& > #endif { private: typedef u32regex_iterator_implementation<BidirectionalIterator> impl; - typedef std::shared_ptr<impl> pimpl; + typedef shared_ptr<impl> pimpl; public: typedef u32regex regex_type; typedef match_results<BidirectionalIterator> value_type; - typedef typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type + typedef typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type difference_type; typedef const value_type* pointer; - typedef const value_type& reference; + typedef const value_type& reference; typedef std::forward_iterator_tag iterator_category; - + u32regex_iterator(){} - u32regex_iterator(BidirectionalIterator a, BidirectionalIterator b, - const regex_type& re, + u32regex_iterator(BidirectionalIterator a, BidirectionalIterator b, + const regex_type& re, match_flag_type m = match_default) : pdata(new impl(&re, b, m)) { @@ -112,10 +112,10 @@ public: return *this; } bool operator==(const u32regex_iterator& that)const - { + { if((pdata.get() == 0) || (that.pdata.get() == 0)) return pdata.get() == that.pdata.get(); - return pdata->compare(*(that.pdata.get())); + return pdata->compare(*(that.pdata.get())); } bool operator!=(const u32regex_iterator& that)const { return !(*this == that); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/u32regex_token_iterator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/u32regex_token_iterator.hpp index 3b12fec9..de167716 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/u32regex_token_iterator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/u32regex_token_iterator.hpp @@ -3,8 +3,8 @@ * Copyright (c) 2003 * John Maddock * - * Use, modification and distribution are subject to the - * Boost Software License, Version 1.0. (See accompanying file + * Use, modification and distribution are subject to the + * Boost Software License, Version 1.0. (See accompanying file * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * */ @@ -25,7 +25,7 @@ // // Borland C++ Builder 6, and Visual C++ 6, // can't cope with the array template constructor -// so we have a template member that will accept any type as +// so we have a template member that will accept any type as // argument, and then assert that is really is an array: // #include <boost/static_assert.hpp> @@ -43,7 +43,7 @@ namespace boost{ #endif template <class BidirectionalIterator> -class u32regex_token_iterator_implementation +class u32regex_token_iterator_implementation { typedef u32regex regex_type; typedef sub_match<BidirectionalIterator> value_type; @@ -115,11 +115,11 @@ public: bool compare(const u32regex_token_iterator_implementation& that) { if(this == &that) return true; - return (&re.get_data() == &that.re.get_data()) - && (end == that.end) - && (flags == that.flags) - && (N == that.N) - && (what[0].first == that.what[0].first) + return (&re.get_data() == &that.re.get_data()) + && (end == that.end) + && (flags == that.flags) + && (N == that.N) + && (what[0].first == that.what[0].first) && (what[0].second == that.what[0].second); } const value_type& get() @@ -158,37 +158,37 @@ private: }; template <class BidirectionalIterator> -class u32regex_token_iterator +class u32regex_token_iterator #ifndef BOOST_NO_STD_ITERATOR : public std::iterator< - std::forward_iterator_tag, + std::forward_iterator_tag, sub_match<BidirectionalIterator>, typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type, const sub_match<BidirectionalIterator>*, - const sub_match<BidirectionalIterator>& > + const sub_match<BidirectionalIterator>& > #endif { private: typedef u32regex_token_iterator_implementation<BidirectionalIterator> impl; - typedef std::shared_ptr<impl> pimpl; + typedef shared_ptr<impl> pimpl; public: typedef u32regex regex_type; typedef sub_match<BidirectionalIterator> value_type; - typedef typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type + typedef typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type difference_type; typedef const value_type* pointer; - typedef const value_type& reference; + typedef const value_type& reference; typedef std::forward_iterator_tag iterator_category; - + u32regex_token_iterator(){} - u32regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, + u32regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, int submatch = 0, match_flag_type m = match_default) : pdata(new impl(&re, b, submatch, m)) { if(!pdata->init(a)) pdata.reset(); } - u32regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, + u32regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, const std::vector<int>& submatches, match_flag_type m = match_default) : pdata(new impl(&re, b, submatches, m)) { @@ -227,10 +227,10 @@ public: return *this; } bool operator==(const u32regex_token_iterator& that)const - { + { if((pdata.get() == 0) || (that.pdata.get() == 0)) return pdata.get() == that.pdata.get(); - return pdata->compare(*(that.pdata.get())); + return pdata->compare(*(that.pdata.get())); } bool operator!=(const u32regex_token_iterator& that)const { return !(*this == that); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/w32_regex_traits.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/w32_regex_traits.hpp index 2d727bc6..d5562072 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/w32_regex_traits.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/regex/v4/w32_regex_traits.hpp @@ -3,12 +3,12 @@ * Copyright (c) 2004 * John Maddock * - * Use, modification and distribution are subject to the - * Boost Software License, Version 1.0. (See accompanying file + * Use, modification and distribution are subject to the + * Boost Software License, Version 1.0. (See accompanying file * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * */ - + /* * LOCATION: see http://www.boost.org for most recent version. * FILE w32_regex_traits.hpp @@ -52,21 +52,21 @@ #pragma warning(disable:4800) #endif -namespace boost{ +namespace boost{ // // forward declaration is needed by some compilers: // template <class charT> class w32_regex_traits; - + namespace re_detail{ // // start by typedeffing the types we'll need: // typedef ::boost::uint32_t lcid_type; // placeholder for LCID. -typedef ::boost::std::shared_ptr<void> cat_type; // placeholder for dll HANDLE. +typedef ::boost::shared_ptr<void> cat_type; // placeholder for dll HANDLE. // // then add wrappers around the actual Win32 API's (ie implementation hiding): @@ -186,7 +186,7 @@ private: }; template <class charT> -w32_regex_traits_char_layer<charT>::w32_regex_traits_char_layer(::boost::re_detail::lcid_type l) +w32_regex_traits_char_layer<charT>::w32_regex_traits_char_layer(::boost::re_detail::lcid_type l) : w32_regex_traits_base<charT>(l) { // we need to start by initialising our syntax map so we know which @@ -232,7 +232,7 @@ w32_regex_traits_char_layer<charT>::w32_regex_traits_char_layer(::boost::re_deta } template <class charT> -typename w32_regex_traits_char_layer<charT>::string_type +typename w32_regex_traits_char_layer<charT>::string_type w32_regex_traits_char_layer<charT>::get_default_message(regex_constants::syntax_type i) { const char* ptr = get_default_syntax(i); @@ -342,7 +342,7 @@ private: }; template <class charT> -typename w32_regex_traits_implementation<charT>::string_type +typename w32_regex_traits_implementation<charT>::string_type w32_regex_traits_implementation<charT>::transform_primary(const charT* p1, const charT* p2) const { string_type result; @@ -388,7 +388,7 @@ typename w32_regex_traits_implementation<charT>::string_type } template <class charT> -typename w32_regex_traits_implementation<charT>::string_type +typename w32_regex_traits_implementation<charT>::string_type w32_regex_traits_implementation<charT>::lookup_collatename(const charT* p1, const charT* p2) const { typedef typename std::map<string_type, string_type>::const_iterator iter_type; @@ -455,8 +455,8 @@ w32_regex_traits_implementation<charT>::w32_regex_traits_implementation(::boost: // // Error messages: // - for(boost::regex_constants::error_type i = static_cast<boost::regex_constants::error_type>(0); - i <= boost::regex_constants::error_unknown; + for(boost::regex_constants::error_type i = static_cast<boost::regex_constants::error_type>(0); + i <= boost::regex_constants::error_unknown; i = static_cast<boost::regex_constants::error_type>(i + 1)) { const char* p = get_default_error_string(i); @@ -477,7 +477,7 @@ w32_regex_traits_implementation<charT>::w32_regex_traits_implementation(::boost: // // Custom class names: // - static const char_class_type masks[14] = + static const char_class_type masks[14] = { 0x0104u, // C1_ALPHA | C1_DIGIT 0x0100u, // C1_ALPHA @@ -509,10 +509,10 @@ w32_regex_traits_implementation<charT>::w32_regex_traits_implementation(::boost: } template <class charT> -typename w32_regex_traits_implementation<charT>::char_class_type +typename w32_regex_traits_implementation<charT>::char_class_type w32_regex_traits_implementation<charT>::lookup_classname_imp(const charT* p1, const charT* p2) const { - static const char_class_type masks[22] = + static const char_class_type masks[22] = { 0, 0x0104u, // C1_ALPHA | C1_DIGIT @@ -522,7 +522,7 @@ typename w32_regex_traits_implementation<charT>::char_class_type 0x0004u, // C1_DIGIT 0x0004u, // C1_DIGIT (~(0x0020u|0x0008u|0x0040) & 0x01ffu) | 0x0400u, // not C1_CNTRL or C1_SPACE or C1_BLANK - w32_regex_traits_implementation<charT>::mask_horizontal, + w32_regex_traits_implementation<charT>::mask_horizontal, 0x0002u, // C1_LOWER 0x0002u, // C1_LOWER (~0x0020u & 0x01ffu) | 0x0400, // not C1_CNTRL @@ -532,9 +532,9 @@ typename w32_regex_traits_implementation<charT>::char_class_type 0x0001u, // C1_UPPER w32_regex_traits_implementation<charT>::mask_unicode, 0x0001u, // C1_UPPER - w32_regex_traits_implementation<charT>::mask_vertical, - 0x0104u | w32_regex_traits_implementation<charT>::mask_word, - 0x0104u | w32_regex_traits_implementation<charT>::mask_word, + w32_regex_traits_implementation<charT>::mask_vertical, + 0x0104u | w32_regex_traits_implementation<charT>::mask_word, + 0x0104u | w32_regex_traits_implementation<charT>::mask_word, 0x0080u, // C1_XDIGIT }; if(m_custom_class_names.size()) @@ -552,7 +552,7 @@ typename w32_regex_traits_implementation<charT>::char_class_type template <class charT> -boost::std::shared_ptr<const w32_regex_traits_implementation<charT> > create_w32_regex_traits(::boost::re_detail::lcid_type l BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(charT)) +boost::shared_ptr<const w32_regex_traits_implementation<charT> > create_w32_regex_traits(::boost::re_detail::lcid_type l BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(charT)) { // TODO: create a cache for previously constructed objects. return boost::object_cache< ::boost::re_detail::lcid_type, w32_regex_traits_implementation<charT> >::get(l, 5); @@ -625,7 +625,7 @@ public: } bool isctype(charT c, char_class_type f) const { - if((f & re_detail::w32_regex_traits_implementation<charT>::mask_base) + if((f & re_detail::w32_regex_traits_implementation<charT>::mask_base) && (this->m_pimpl->isctype(f & re_detail::w32_regex_traits_implementation<charT>::mask_base, c))) return true; else if((f & re_detail::w32_regex_traits_implementation<charT>::mask_unicode) && re_detail::is_extended(c)) @@ -635,7 +635,7 @@ public: else if((f & re_detail::w32_regex_traits_implementation<charT>::mask_vertical) && (::boost::re_detail::is_separator(c) || (c == '\v'))) return true; - else if((f & re_detail::w32_regex_traits_implementation<charT>::mask_horizontal) + else if((f & re_detail::w32_regex_traits_implementation<charT>::mask_horizontal) && this->isctype(c, 0x0008u) && !this->isctype(c, re_detail::w32_regex_traits_implementation<charT>::mask_vertical)) return true; return false; @@ -672,7 +672,7 @@ public: static std::string get_catalog_name(); private: - boost::std::shared_ptr<const re_detail::w32_regex_traits_implementation<charT> > m_pimpl; + boost::shared_ptr<const re_detail::w32_regex_traits_implementation<charT> > m_pimpl; // // catalog name handler: // diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/detail/shared_ptr_132.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/detail/shared_ptr_132.hpp index 897062f2..b5f2b215 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/detail/shared_ptr_132.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/detail/shared_ptr_132.hpp @@ -2,7 +2,7 @@ #define BOOST_SHARED_PTR_132_HPP_INCLUDED // -// std::shared_ptr.hpp +// shared_ptr.hpp // // (C) Copyright Greg Colvin and Beman Dawes 1998, 1999. // Copyright (c) 2001, 2002, 2003 Peter Dimov @@ -11,7 +11,7 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // -// See http://www.boost.org/libs/smart_ptr/std::shared_ptr.htm for documentation. +// See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation. // #include <boost/config.hpp> // for broken compiler workarounds @@ -96,18 +96,18 @@ inline void sp_enable_shared_from_this( shared_count const & /*pn*/, ... ) // -// std::shared_ptr +// shared_ptr // // An enhanced relative of scoped_ptr with reference counted copy semantics. -// The object pointed to is deleted when the last std::shared_ptr pointing to it +// The object pointed to is deleted when the last shared_ptr pointing to it // is destroyed or reset. // -template<class T> class std::shared_ptr +template<class T> class shared_ptr { private: // Borland 5.5.1 specific workaround - typedef std::shared_ptr< T > this_type; + typedef shared_ptr< T > this_type; public: @@ -116,16 +116,16 @@ public: typedef T * pointer; typedef BOOST_DEDUCED_TYPENAME detail::shared_ptr_traits< T >::reference reference; - std::shared_ptr(): px(0), pn() // never throws in 1.30+ + shared_ptr(): px(0), pn() // never throws in 1.30+ { } #if BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x564) ) template<class Y> - explicit std::shared_ptr(Y * p): px(p), pn(p, boost::checked_deleter<Y>()) // Y must be complete + explicit shared_ptr(Y * p): px(p), pn(p, boost::checked_deleter<Y>()) // Y must be complete #else template<class Y> - explicit std::shared_ptr(Y * p): px(p), pn(p, boost::checked_deleter<Y>()) // Y must be complete + explicit shared_ptr(Y * p): px(p), pn(p, boost::checked_deleter<Y>()) // Y must be complete #endif { detail::sp_enable_shared_from_this( pn, p, p ); @@ -134,10 +134,10 @@ public: // // Requirements: D's copy constructor must not throw // - // std::shared_ptr will release p by calling d(p) + // shared_ptr will release p by calling d(p) // - template<class Y, class D> std::shared_ptr(Y * p, D d): px(p), pn(p, d) + template<class Y, class D> shared_ptr(Y * p, D d): px(p), pn(p, d) { detail::sp_enable_shared_from_this( pn, p, p ); } @@ -147,7 +147,7 @@ public: // except that Borland C++ has a bug, and g++ with -Wsynth warns #if defined(__BORLANDC__) || defined(__GNUC__) - std::shared_ptr & operator=(std::shared_ptr const & r) // never throws + shared_ptr & operator=(shared_ptr const & r) // never throws { px = r.px; pn = r.pn; // shared_count::op= doesn't throw @@ -157,29 +157,29 @@ public: #endif template<class Y> - explicit std::shared_ptr(weak_ptr<Y> const & r): pn(r.pn) // may throw + explicit shared_ptr(weak_ptr<Y> const & r): pn(r.pn) // may throw { // it is now safe to copy r.px, as pn(r.pn) did not throw px = r.px; } template<class Y> - std::shared_ptr(std::shared_ptr<Y> const & r): px(r.px), pn(r.pn) // never throws + shared_ptr(shared_ptr<Y> const & r): px(r.px), pn(r.pn) // never throws { } template<class Y> - std::shared_ptr(std::shared_ptr<Y> const & r, detail::static_cast_tag): px(static_cast<element_type *>(r.px)), pn(r.pn) + shared_ptr(shared_ptr<Y> const & r, detail::static_cast_tag): px(static_cast<element_type *>(r.px)), pn(r.pn) { } template<class Y> - std::shared_ptr(std::shared_ptr<Y> const & r, detail::const_cast_tag): px(const_cast<element_type *>(r.px)), pn(r.pn) + shared_ptr(shared_ptr<Y> const & r, detail::const_cast_tag): px(const_cast<element_type *>(r.px)), pn(r.pn) { } template<class Y> - std::shared_ptr(std::shared_ptr<Y> const & r, detail::dynamic_cast_tag): px(dynamic_cast<element_type *>(r.px)), pn(r.pn) + shared_ptr(shared_ptr<Y> const & r, detail::dynamic_cast_tag): px(dynamic_cast<element_type *>(r.px)), pn(r.pn) { if(px == 0) // need to allocate new counter -- the cast failed { @@ -188,7 +188,7 @@ public: } template<class Y> - std::shared_ptr(std::shared_ptr<Y> const & r, detail::polymorphic_cast_tag): px(dynamic_cast<element_type *>(r.px)), pn(r.pn) + shared_ptr(shared_ptr<Y> const & r, detail::polymorphic_cast_tag): px(dynamic_cast<element_type *>(r.px)), pn(r.pn) { if(px == 0) { @@ -199,7 +199,7 @@ public: #ifndef BOOST_NO_AUTO_PTR template<class Y> - explicit std::shared_ptr(std::auto_ptr<Y> & r): px(r.get()), pn() + explicit shared_ptr(std::auto_ptr<Y> & r): px(r.get()), pn() { Y * tmp = r.get(); pn = detail::shared_count(r); @@ -211,7 +211,7 @@ public: #if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200) template<class Y> - std::shared_ptr & operator=(std::shared_ptr<Y> const & r) // never throws + shared_ptr & operator=(shared_ptr<Y> const & r) // never throws { px = r.px; pn = r.pn; // shared_count::op= doesn't throw @@ -223,7 +223,7 @@ public: #ifndef BOOST_NO_AUTO_PTR template<class Y> - std::shared_ptr & operator=(std::auto_ptr<Y> & r) + shared_ptr & operator=(std::auto_ptr<Y> & r) { this_type(r).swap(*this); return *this; @@ -258,7 +258,7 @@ public: BOOST_ASSERT(px != 0); return px; } - + T * get() const // never throws { return px; @@ -275,13 +275,13 @@ public: #elif defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) typedef T * (this_type::*unspecified_bool_type)() const; - + operator unspecified_bool_type() const // never throws { return px == 0? 0: &this_type::get; } -#else +#else typedef T * this_type::*unspecified_bool_type; @@ -309,13 +309,13 @@ public: return pn.use_count(); } - void swap(std::shared_ptr< T > & other) // never throws + void swap(shared_ptr< T > & other) // never throws { std::swap(px, other.px); pn.swap(other.pn); } - template<class Y> bool _internal_less(std::shared_ptr<Y> const & rhs) const + template<class Y> bool _internal_less(shared_ptr<Y> const & rhs) const { return pn < rhs.pn; } @@ -332,7 +332,7 @@ public: private: - template<class Y> friend class std::shared_ptr; + template<class Y> friend class shared_ptr; template<class Y> friend class weak_ptr; @@ -341,14 +341,14 @@ public: // for serialization T * px; // contained pointer detail::shared_count pn; // reference counter -}; // std::shared_ptr +}; // shared_ptr -template<class T, class U> inline bool operator==(std::shared_ptr< T > const & a, std::shared_ptr<U> const & b) +template<class T, class U> inline bool operator==(shared_ptr< T > const & a, shared_ptr<U> const & b) { return a.get() == b.get(); } -template<class T, class U> inline bool operator!=(std::shared_ptr< T > const & a, std::shared_ptr<U> const & b) +template<class T, class U> inline bool operator!=(shared_ptr< T > const & a, shared_ptr<U> const & b) { return a.get() != b.get(); } @@ -357,64 +357,64 @@ template<class T, class U> inline bool operator!=(std::shared_ptr< T > const & a // Resolve the ambiguity between our op!= and the one in rel_ops -template<class T> inline bool operator!=(std::shared_ptr< T > const & a, std::shared_ptr< T > const & b) +template<class T> inline bool operator!=(shared_ptr< T > const & a, shared_ptr< T > const & b) { return a.get() != b.get(); } #endif -template<class T, class U> inline bool operator<(std::shared_ptr< T > const & a, std::shared_ptr<U> const & b) +template<class T, class U> inline bool operator<(shared_ptr< T > const & a, shared_ptr<U> const & b) { return a._internal_less(b); } -template<class T> inline void swap(std::shared_ptr< T > & a, std::shared_ptr< T > & b) +template<class T> inline void swap(shared_ptr< T > & a, shared_ptr< T > & b) { a.swap(b); } -template<class T, class U> std::shared_ptr< T > static_pointer_cast(std::shared_ptr<U> const & r) +template<class T, class U> shared_ptr< T > static_pointer_cast(shared_ptr<U> const & r) { - return std::shared_ptr< T >(r, detail::static_cast_tag()); + return shared_ptr< T >(r, detail::static_cast_tag()); } -template<class T, class U> std::shared_ptr< T > const_pointer_cast(std::shared_ptr<U> const & r) +template<class T, class U> shared_ptr< T > const_pointer_cast(shared_ptr<U> const & r) { - return std::shared_ptr< T >(r, detail::const_cast_tag()); + return shared_ptr< T >(r, detail::const_cast_tag()); } -template<class T, class U> std::shared_ptr< T > dynamic_pointer_cast(std::shared_ptr<U> const & r) +template<class T, class U> shared_ptr< T > dynamic_pointer_cast(shared_ptr<U> const & r) { - return std::shared_ptr< T >(r, detail::dynamic_cast_tag()); + return shared_ptr< T >(r, detail::dynamic_cast_tag()); } // shared_*_cast names are deprecated. Use *_pointer_cast instead. -template<class T, class U> std::shared_ptr< T > shared_static_cast(std::shared_ptr<U> const & r) +template<class T, class U> shared_ptr< T > shared_static_cast(shared_ptr<U> const & r) { - return std::shared_ptr< T >(r, detail::static_cast_tag()); + return shared_ptr< T >(r, detail::static_cast_tag()); } -template<class T, class U> std::shared_ptr< T > shared_dynamic_cast(std::shared_ptr<U> const & r) +template<class T, class U> shared_ptr< T > shared_dynamic_cast(shared_ptr<U> const & r) { - return std::shared_ptr< T >(r, detail::dynamic_cast_tag()); + return shared_ptr< T >(r, detail::dynamic_cast_tag()); } -template<class T, class U> std::shared_ptr< T > shared_polymorphic_cast(std::shared_ptr<U> const & r) +template<class T, class U> shared_ptr< T > shared_polymorphic_cast(shared_ptr<U> const & r) { - return std::shared_ptr< T >(r, detail::polymorphic_cast_tag()); + return shared_ptr< T >(r, detail::polymorphic_cast_tag()); } -template<class T, class U> std::shared_ptr< T > shared_polymorphic_downcast(std::shared_ptr<U> const & r) +template<class T, class U> shared_ptr< T > shared_polymorphic_downcast(shared_ptr<U> const & r) { BOOST_ASSERT(dynamic_cast<T *>(r.get()) == r.get()); return shared_static_cast< T >(r); } -// get_pointer() enables boost::mem_fn to recognize std::shared_ptr +// get_pointer() enables boost::mem_fn to recognize shared_ptr -template<class T> inline T * get_pointer(std::shared_ptr< T > const & p) +template<class T> inline T * get_pointer(shared_ptr< T > const & p) { return p.get(); } @@ -423,7 +423,7 @@ template<class T> inline T * get_pointer(std::shared_ptr< T > const & p) #if defined(__GNUC__) && (__GNUC__ < 3) -template<class Y> std::ostream & operator<< (std::ostream & os, std::shared_ptr<Y> const & p) +template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p) { os << p.get(); return os; @@ -434,10 +434,10 @@ template<class Y> std::ostream & operator<< (std::ostream & os, std::shared_ptr< # if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, <= 1200 && __SGI_STL_PORT) // MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL using std::basic_ostream; -template<class E, class T, class Y> basic_ostream<E, T> & operator<< (basic_ostream<E, T> & os, std::shared_ptr<Y> const & p) +template<class E, class T, class Y> basic_ostream<E, T> & operator<< (basic_ostream<E, T> & os, shared_ptr<Y> const & p) # else -template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, std::shared_ptr<Y> const & p) -# endif +template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, shared_ptr<Y> const & p) +# endif { os << p.get(); return os; @@ -452,7 +452,7 @@ template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std:: // g++ 2.9x doesn't allow static_cast<X const *>(void *) // apparently EDG 2.38 also doesn't accept it -template<class D, class T> D * get_deleter(std::shared_ptr< T > const & p) +template<class D, class T> D * get_deleter(shared_ptr< T > const & p) { void const * q = p._internal_get_deleter(typeid(D)); return const_cast<D *>(static_cast<D const *>(q)); @@ -460,7 +460,7 @@ template<class D, class T> D * get_deleter(std::shared_ptr< T > const & p) #else -template<class D, class T> D * get_deleter(std::shared_ptr< T > const & p) +template<class D, class T> D * get_deleter(shared_ptr< T > const & p) { return static_cast<D *>(p._internal_get_deleter(typeid(D))); } @@ -471,7 +471,7 @@ template<class D, class T> D * get_deleter(std::shared_ptr< T > const & p) #ifdef BOOST_MSVC # pragma warning(pop) -#endif +#endif #endif // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES) diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/detail/shared_ptr_nmt_132.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/detail/shared_ptr_nmt_132.hpp index 0f9c8282..490e7ddd 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/detail/shared_ptr_nmt_132.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/detail/shared_ptr_nmt_132.hpp @@ -2,7 +2,7 @@ #define BOOST_DETAIL_SHARED_PTR_NMT_132_HPP_INCLUDED // -// detail/shared_ptr_nmt.hpp - std::shared_ptr.hpp without member templates +// detail/shared_ptr_nmt.hpp - shared_ptr.hpp without member templates // // (C) Copyright Greg Colvin and Beman Dawes 1998, 1999. // Copyright (c) 2001, 2002 Peter Dimov @@ -11,7 +11,7 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // -// See http://www.boost.org/libs/smart_ptr/std::shared_ptr.htm for documentation. +// See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation. // #include <boost/assert.hpp> @@ -30,7 +30,7 @@ namespace boost { -template<class T> class std::shared_ptr +template<class T> class shared_ptr { private: @@ -41,7 +41,7 @@ public: typedef T element_type; typedef T value_type; - explicit std::shared_ptr(T * p = 0): px(p) + explicit shared_ptr(T * p = 0): px(p) { #ifndef BOOST_NO_EXCEPTIONS @@ -68,7 +68,7 @@ public: #endif } - ~std::shared_ptr() + ~shared_ptr() { if(--*pn == 0) { @@ -77,29 +77,29 @@ public: } } - std::shared_ptr(std::shared_ptr const & r): px(r.px) // never throws + shared_ptr(shared_ptr const & r): px(r.px) // never throws { pn = r.pn; ++*pn; } - std::shared_ptr & operator=(std::shared_ptr const & r) + shared_ptr & operator=(shared_ptr const & r) { - std::shared_ptr(r).swap(*this); + shared_ptr(r).swap(*this); return *this; } #ifndef BOOST_NO_AUTO_PTR - explicit std::shared_ptr(std::auto_ptr< T > & r) - { + explicit shared_ptr(std::auto_ptr< T > & r) + { pn = new count_type(1); // may throw px = r.release(); // fix: moved here to stop leak if new throws - } + } - std::shared_ptr & operator=(std::auto_ptr< T > & r) + shared_ptr & operator=(std::auto_ptr< T > & r) { - std::shared_ptr(r).swap(*this); + shared_ptr(r).swap(*this); return *this; } @@ -108,7 +108,7 @@ public: void reset(T * p = 0) { BOOST_ASSERT(p == 0 || p != px); - std::shared_ptr(p).swap(*this); + shared_ptr(p).swap(*this); } T & operator*() const // never throws @@ -137,8 +137,8 @@ public: { return *pn == 1; } - - void swap(std::shared_ptr< T > & other) // never throws + + void swap(shared_ptr< T > & other) // never throws { std::swap(px, other.px); std::swap(pn, other.pn); @@ -150,29 +150,29 @@ private: count_type * pn; // ptr to reference counter }; -template<class T, class U> inline bool operator==(std::shared_ptr< T > const & a, std::shared_ptr<U> const & b) +template<class T, class U> inline bool operator==(shared_ptr< T > const & a, shared_ptr<U> const & b) { return a.get() == b.get(); } -template<class T, class U> inline bool operator!=(std::shared_ptr< T > const & a, std::shared_ptr<U> const & b) +template<class T, class U> inline bool operator!=(shared_ptr< T > const & a, shared_ptr<U> const & b) { return a.get() != b.get(); } -template<class T> inline bool operator<(std::shared_ptr< T > const & a, std::shared_ptr< T > const & b) +template<class T> inline bool operator<(shared_ptr< T > const & a, shared_ptr< T > const & b) { return std::less<T*>()(a.get(), b.get()); } -template<class T> void swap(std::shared_ptr< T > & a, std::shared_ptr< T > & b) +template<class T> void swap(shared_ptr< T > & a, shared_ptr< T > & b) { a.swap(b); } -// get_pointer() enables boost::mem_fn to recognize std::shared_ptr +// get_pointer() enables boost::mem_fn to recognize shared_ptr -template<class T> inline T * get_pointer(std::shared_ptr< T > const & p) +template<class T> inline T * get_pointer(shared_ptr< T > const & p) { return p.get(); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/shared_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/shared_ptr.hpp index 63eab8c5..37f95e35 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/shared_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/shared_ptr.hpp @@ -7,7 +7,7 @@ #endif /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// std::shared_ptr.hpp: serialization for boost shared pointer +// shared_ptr.hpp: serialization for boost shared pointer // (C) Copyright 2004 Robert Ramey and Martin Ecker // Use, modification and distribution is subject to the Boost Software @@ -23,7 +23,7 @@ #include <boost/mpl/integral_c_tag.hpp> #include <boost/detail/workaround.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/serialization/split_free.hpp> #include <boost/serialization/nvp.hpp> @@ -31,7 +31,7 @@ #include <boost/serialization/tracking.hpp> /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// std::shared_ptr serialization traits +// shared_ptr serialization traits // version 1 to distinguish from boost 1.32 version. Note: we can only do this // for a template when the compiler supports partial template specialization @@ -39,7 +39,7 @@ namespace boost { namespace serialization{ template<class T> - struct version< ::boost::std::shared_ptr< T > > { + struct version< ::boost::shared_ptr< T > > { typedef mpl::integral_c_tag tag; #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3206)) typedef BOOST_DEDUCED_TYPENAME mpl::int_<1> type; @@ -54,7 +54,7 @@ }; // don't track shared pointers template<class T> - struct tracking_level< ::boost::std::shared_ptr< T > > { + struct tracking_level< ::boost::shared_ptr< T > > { typedef mpl::integral_c_tag tag; #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3206)) typedef BOOST_DEDUCED_TYPENAME mpl::int_< ::boost::serialization::track_never> type; @@ -73,11 +73,11 @@ // define macro to let users of these compilers do this #define BOOST_SERIALIZATION_SHARED_PTR(T) \ BOOST_CLASS_VERSION( \ - ::boost::std::shared_ptr< T >, \ + ::boost::shared_ptr< T >, \ 1 \ ) \ BOOST_CLASS_TRACKING( \ - ::boost::std::shared_ptr< T >, \ + ::boost::shared_ptr< T >, \ ::boost::serialization::track_never \ ) \ /**/ @@ -91,16 +91,16 @@ struct null_deleter { }; /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// serialization for std::shared_ptr +// serialization for shared_ptr template<class Archive, class T> inline void save( Archive & ar, - const boost::std::shared_ptr< T > &t, + const boost::shared_ptr< T > &t, const unsigned int /* file_version */ ){ // The most common cause of trapping here would be serializing - // something like std::shared_ptr<int>. This occurs because int + // something like shared_ptr<int>. This occurs because int // is never tracked by default. Wrap int in a trackable type BOOST_STATIC_ASSERT((tracking_level< T >::value != track_never)); const T * t_ptr = t.get(); @@ -111,11 +111,11 @@ inline void save( template<class Archive, class T> inline void load( Archive & ar, - boost::std::shared_ptr< T > &t, + boost::shared_ptr< T > &t, const unsigned int file_version ){ // The most common cause of trapping here would be serializing - // something like std::shared_ptr<int>. This occurs because int + // something like shared_ptr<int>. This occurs because int // is never tracked by default. Wrap int in a trackable type BOOST_STATIC_ASSERT((tracking_level< T >::value != track_never)); T* r; @@ -126,7 +126,7 @@ inline void load( ar.register_type(static_cast< boost_132::detail::sp_counted_base_impl<T *, null_deleter > * >(NULL)); - boost_132::std::shared_ptr< T > sp; + boost_132::shared_ptr< T > sp; ar >> boost::serialization::make_nvp("px", sp.px); ar >> boost::serialization::make_nvp("pn", sp.pn); // got to keep the sps around so the sp.pns don't disappear @@ -143,11 +143,11 @@ inline void load( template<class Archive, class T> inline void load( Archive & ar, - boost::std::shared_ptr< T > &t, + boost::shared_ptr< T > &t, const unsigned int /*file_version*/ ){ // The most common cause of trapping here would be serializing - // something like std::shared_ptr<int>. This occurs because int + // something like shared_ptr<int>. This occurs because int // is never tracked by default. Wrap int in a trackable type BOOST_STATIC_ASSERT((tracking_level< T >::value != track_never)); T* r; @@ -159,10 +159,10 @@ inline void load( template<class Archive, class T> inline void serialize( Archive & ar, - boost::std::shared_ptr< T > &t, + boost::shared_ptr< T > &t, const unsigned int file_version ){ - // correct std::shared_ptr serialization depends upon object tracking + // correct shared_ptr serialization depends upon object tracking // being used. BOOST_STATIC_ASSERT( boost::serialization::tracking_level< T >::value diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/shared_ptr_132.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/shared_ptr_132.hpp index cdc888b8..9bcefe09 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/shared_ptr_132.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/shared_ptr_132.hpp @@ -7,9 +7,9 @@ #endif /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// std::shared_ptr.hpp: serialization for boost shared pointer +// shared_ptr.hpp: serialization for boost shared pointer -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -17,8 +17,8 @@ // See http://www.boost.org for updates, documentation, and revision history. // note: totally unadvised hack to gain access to private variables -// in std::shared_ptr and shared_count. Unfortunately its the only way to -// do this without changing std::shared_ptr and shared_count +// in shared_ptr and shared_count. Unfortunately its the only way to +// do this without changing shared_ptr and shared_count // the best we can do is to detect a conflict here #include <boost/config.hpp> @@ -38,7 +38,7 @@ // Maintain a couple of lists of loaded shared pointers of the old previous // version (1.32) -namespace boost_132 { +namespace boost_132 { namespace serialization { namespace detail { @@ -53,7 +53,7 @@ struct null_deleter { ///////////////////////////////////////////////////////////// // sp_counted_base_impl serialization -namespace boost { +namespace boost { namespace serialization { template<class Archive, class P, class D> @@ -66,7 +66,7 @@ inline void serialize( // its polymorphic base boost::serialization::void_cast_register< boost_132::detail::sp_counted_base_impl<P, D>, - boost_132::detail::sp_counted_base + boost_132::detail::sp_counted_base >( static_cast<boost_132::detail::sp_counted_base_impl<P, D> *>(NULL), static_cast<boost_132::detail::sp_counted_base *>(NULL) @@ -76,8 +76,8 @@ inline void serialize( template<class Archive, class P, class D> inline void save_construct_data( Archive & ar, - const - boost_132::detail::sp_counted_base_impl<P, D> *t, + const + boost_132::detail::sp_counted_base_impl<P, D> *t, const BOOST_PFTO unsigned int /* file_version */ ){ // variables used for construction @@ -87,25 +87,25 @@ inline void save_construct_data( template<class Archive, class P, class D> inline void load_construct_data( Archive & ar, - boost_132::detail::sp_counted_base_impl<P, D> * t, + boost_132::detail::sp_counted_base_impl<P, D> * t, const unsigned int /* file_version */ ){ P ptr_; ar >> boost::serialization::make_nvp("ptr", ptr_); - // ::new(t)boost_132::detail::sp_counted_base_impl<P, D>(ptr_, D()); + // ::new(t)boost_132::detail::sp_counted_base_impl<P, D>(ptr_, D()); // placement // note: the original ::new... above is replaced by the one here. This one // creates all new objects with a null_deleter so that after the archive // is finished loading and the shared_ptrs are destroyed - the underlying - // raw pointers are NOT deleted. This is necessary as they are used by the + // raw pointers are NOT deleted. This is necessary as they are used by the // new system as well. ::new(t)boost_132::detail::sp_counted_base_impl< - P, + P, boost_132::serialization::detail::null_deleter >( ptr_, boost_132::serialization::detail::null_deleter() ); // placement new - // compensate for that fact that a new shared count always is + // compensate for that fact that a new shared count always is // initialized with one. the add_ref_copy below will increment it // every time its serialized so without this adjustment // the use and weak counts will be off by one. @@ -118,7 +118,7 @@ inline void load_construct_data( ///////////////////////////////////////////////////////////// // shared_count serialization -namespace boost { +namespace boost { namespace serialization { template<class Archive> @@ -147,15 +147,15 @@ inline void load( BOOST_SERIALIZATION_SPLIT_FREE(boost_132::detail::shared_count) ///////////////////////////////////////////////////////////// -// implement serialization for std::shared_ptr< T > +// implement serialization for shared_ptr< T > -namespace boost { +namespace boost { namespace serialization { template<class Archive, class T> inline void save( Archive & ar, - const boost_132::std::shared_ptr< T > &t, + const boost_132::shared_ptr< T > &t, const unsigned int /* file_version */ ){ // only the raw pointer has to be saved @@ -170,7 +170,7 @@ inline void save( template<class Archive, class T> inline void load( Archive & ar, - boost_132::std::shared_ptr< T > &t, + boost_132::shared_ptr< T > &t, const unsigned int /* file_version */ ){ // only the raw pointer has to be saved @@ -185,10 +185,10 @@ inline void load( template<class Archive, class T> inline void serialize( Archive & ar, - boost_132::std::shared_ptr< T > &t, + boost_132::shared_ptr< T > &t, const unsigned int file_version ){ - // correct std::shared_ptr serialization depends upon object tracking + // correct shared_ptr serialization depends upon object tracking // being used. BOOST_STATIC_ASSERT( boost::serialization::tracking_level< T >::value @@ -200,7 +200,7 @@ inline void serialize( } // serialization } // namespace boost -// note: change below uses null_deleter +// note: change below uses null_deleter // This macro is used to export GUIDS for shared pointers to allow // the serialization system to export them properly. David Tonge #define BOOST_SHARED_POINTER_EXPORT_GUID(T, K) \ diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/weak_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/weak_ptr.hpp index a6add742..3fe8698d 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/weak_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/serialization/weak_ptr.hpp @@ -7,7 +7,7 @@ #endif /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// std::shared_ptr.hpp: serialization for boost shared pointer +// shared_ptr.hpp: serialization for boost shared pointer // (C) Copyright 2004 Robert Ramey and Martin Ecker // Use, modification and distribution is subject to the Boost Software @@ -17,7 +17,7 @@ // See http://www.boost.org for updates, documentation, and revision history. #include <boost/weak_ptr.hpp> -#include <boost/serialization/std::shared_ptr.hpp> +#include <boost/serialization/shared_ptr.hpp> namespace boost { namespace serialization{ @@ -28,7 +28,7 @@ inline void save( const boost::weak_ptr< T > &t, const unsigned int /* file_version */ ){ - const boost::std::shared_ptr< T > sp = t.lock(); + const boost::shared_ptr< T > sp = t.lock(); ar << boost::serialization::make_nvp("weak_ptr", sp); } @@ -38,7 +38,7 @@ inline void load( boost::weak_ptr< T > &t, const unsigned int /* file_version */ ){ - boost::std::shared_ptr< T > sp; + boost::shared_ptr< T > sp; ar >> boost::serialization::make_nvp("weak_ptr", sp); t = sp; } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/shared_container_iterator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/shared_container_iterator.hpp index 5a8f0af5..7d8ecd3e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/shared_container_iterator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/shared_container_iterator.hpp @@ -9,7 +9,7 @@ #define SHARED_CONTAINER_ITERATOR_RG08102002_HPP #include "boost/iterator_adaptors.hpp" -#include "boost/std::shared_ptr.hpp" +#include "boost/shared_ptr.hpp" #include <utility> namespace boost { @@ -24,7 +24,7 @@ class shared_container_iterator : public iterator_adaptor< typename Container::iterator> super_t; typedef typename Container::iterator iterator_t; - typedef boost::std::shared_ptr<Container> container_ref_t; + typedef boost::shared_ptr<Container> container_ref_t; container_ref_t container_ref; public: @@ -39,7 +39,7 @@ public: template <typename Container> shared_container_iterator<Container> make_shared_container_iterator(typename Container::iterator iter, - boost::std::shared_ptr<Container> const& container) { + boost::shared_ptr<Container> const& container) { typedef shared_container_iterator<Container> iterator; return iterator(iter,container); } @@ -50,7 +50,7 @@ template <typename Container> std::pair< shared_container_iterator<Container>, shared_container_iterator<Container> > -make_shared_container_range(boost::std::shared_ptr<Container> const& container) { +make_shared_container_range(boost::shared_ptr<Container> const& container) { return std::make_pair( make_shared_container_iterator(container->begin(),container), diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/shared_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/shared_ptr.hpp index bcc40bff..d31978c9 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/shared_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/shared_ptr.hpp @@ -2,7 +2,7 @@ #define BOOST_SHARED_PTR_HPP_INCLUDED // -// std::shared_ptr.hpp +// shared_ptr.hpp // // (C) Copyright Greg Colvin and Beman Dawes 1998, 1999. // Copyright (c) 2001-2008 Peter Dimov @@ -11,9 +11,9 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // -// See http://www.boost.org/libs/smart_ptr/std::shared_ptr.htm for documentation. +// See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation. // -#include <boost/smart_ptr/std::shared_ptr.hpp> +#include <boost/smart_ptr/shared_ptr.hpp> #endif // #ifndef BOOST_SHARED_PTR_HPP_INCLUDED diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/connection.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/connection.hpp index 8ef685b1..1ede6be7 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/connection.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/connection.hpp @@ -97,7 +97,7 @@ namespace boost { void set_controlling(bool control = true) { controlling_connection = control; } - std::shared_ptr<BOOST_SIGNALS_NAMESPACE::detail::basic_connection> + shared_ptr<BOOST_SIGNALS_NAMESPACE::detail::basic_connection> get_connection() const { return con; } @@ -115,7 +115,7 @@ namespace boost { friend class BOOST_SIGNALS_NAMESPACE::detail::bound_objects_visitor; // Pointer to the actual contents of the connection - std::shared_ptr<BOOST_SIGNALS_NAMESPACE::detail::basic_connection> con; + shared_ptr<BOOST_SIGNALS_NAMESPACE::detail::basic_connection> con; // True if the destruction of this connection object should disconnect bool controlling_connection; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/detail/named_slot_map.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/detail/named_slot_map.hpp index 84a1e04c..88625fae 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/detail/named_slot_map.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/detail/named_slot_map.hpp @@ -14,7 +14,7 @@ #include <boost/signals/detail/signals_common.hpp> #include <boost/signals/connection.hpp> #include <boost/utility.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/function/function2.hpp> #include <boost/iterator/iterator_facade.hpp> #include <map> @@ -45,7 +45,7 @@ class stored_group private: storage_kind kind; - std::shared_ptr<void> group; + shared_ptr<void> group; }; typedef function2<bool, stored_group, stored_group> compare_type; @@ -60,7 +60,7 @@ public: typedef const stored_group& first_argument_type; typedef const stored_group& second_argument_type; - group_bridge_compare(const Compare& c) : comp(c) + group_bridge_compare(const Compare& c) : comp(c) { } bool operator()(const stored_group& k1, const stored_group& k2) const @@ -93,15 +93,15 @@ class BOOST_SIGNALS_DECL named_slot_map_iterator : connection_slot_pair, forward_traversal_tag> inherited; public: - named_slot_map_iterator() : slot_assigned(false) + named_slot_map_iterator() : slot_assigned(false) { } - named_slot_map_iterator(const named_slot_map_iterator& other) + named_slot_map_iterator(const named_slot_map_iterator& other) : group(other.group), last_group(other.last_group), slot_assigned(other.slot_assigned) { if (slot_assigned) slot_ = other.slot_; } - named_slot_map_iterator& operator=(const named_slot_map_iterator& other) + named_slot_map_iterator& operator=(const named_slot_map_iterator& other) { slot_assigned = other.slot_assigned; group = other.group; @@ -109,11 +109,11 @@ public: if (slot_assigned) slot_ = other.slot_; return *this; } - connection_slot_pair& dereference() const + connection_slot_pair& dereference() const { return *slot_; } - void increment() + void increment() { ++slot_; if (slot_ == group->second.end()) { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/detail/signal_base.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/detail/signal_base.hpp index d82100ce..0438cf7b 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/detail/signal_base.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/detail/signal_base.hpp @@ -33,10 +33,10 @@ namespace boost { // manages call depth class BOOST_SIGNALS_DECL call_notification { public: - call_notification(const std::shared_ptr<signal_base_impl>&); + call_notification(const shared_ptr<signal_base_impl>&); ~call_notification(); - std::shared_ptr<signal_base_impl> impl; + shared_ptr<signal_base_impl> impl; }; // Implementation of base class for all signals. It handles the @@ -87,7 +87,7 @@ namespace boost { connection connect_slot(const any& slot, const stored_group& name, - std::shared_ptr<slot_base::data_t> data, + shared_ptr<slot_base::data_t> data, connect_position at); private: @@ -138,7 +138,7 @@ namespace boost { protected: connection connect_slot(const any& slot, const stored_group& name, - std::shared_ptr<slot_base::data_t> data, + shared_ptr<slot_base::data_t> data, connect_position at) { return impl->connect_slot(slot, name, data, at); @@ -146,7 +146,7 @@ namespace boost { typedef named_slot_map::iterator iterator; - std::shared_ptr<signal_base_impl> impl; + shared_ptr<signal_base_impl> impl; }; } // end namespace detail } // end namespace BOOST_SIGNALS_NAMESPACE diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/slot.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/slot.hpp index 6d1533d2..bbf18480 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/slot.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals/slot.hpp @@ -14,7 +14,7 @@ #include <boost/signals/connection.hpp> #include <boost/signals/trackable.hpp> #include <boost/visit_each.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <cassert> #ifdef BOOST_HAS_ABI_HEADERS @@ -33,7 +33,7 @@ namespace boost { std::vector<const trackable*> bound_objects; connection watch_bound_objects; }; - std::shared_ptr<data_t> get_data() const { return data; } + shared_ptr<data_t> get_data() const { return data; } // Get the set of bound objects std::vector<const trackable*>& get_bound_objects() const @@ -41,14 +41,14 @@ namespace boost { // Determine if this slot is still "active", i.e., all of the bound // objects still exist - bool is_active() const + bool is_active() const { return data->watch_bound_objects.connected(); } protected: // Create a connection for this slot void create_connection(); - std::shared_ptr<data_t> data; + shared_ptr<data_t> data; private: static void bound_object_destructed(void*, void*) {} @@ -116,9 +116,9 @@ namespace boost { // An exception thrown here will allow the basic_connection to be // destroyed when this goes out of scope, and no other connections // have been made. - BOOST_SIGNALS_NAMESPACE::detail::bound_objects_visitor + BOOST_SIGNALS_NAMESPACE::detail::bound_objects_visitor do_bind(this->data->bound_objects); - visit_each(do_bind, + visit_each(do_bind, BOOST_SIGNALS_NAMESPACE::get_inspectable_slot (f, BOOST_SIGNALS_NAMESPACE::tag_type(f))); create_connection(); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/connection.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/connection.hpp index 13136cc6..0271a3c1 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/connection.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/connection.hpp @@ -17,7 +17,7 @@ #include <boost/function.hpp> #include <boost/mpl/bool.hpp> #include <boost/noncopyable.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/signals2/detail/null_output_iterator.hpp> #include <boost/signals2/detail/unique_lock.hpp> #include <boost/signals2/slot.hpp> @@ -48,11 +48,11 @@ namespace boost _connected = false; } virtual bool connected() const = 0; - std::shared_ptr<void> get_blocker() + shared_ptr<void> get_blocker() { unique_lock<connection_body_base> local_lock(*this); - std::shared_ptr<void> blocker = _weak_blocker.lock(); - if(blocker == std::shared_ptr<void>()) + shared_ptr<void> blocker = _weak_blocker.lock(); + if(blocker == shared_ptr<void>()) { blocker.reset(this, &null_deleter); _weak_blocker = blocker; @@ -161,26 +161,26 @@ namespace boost ~connection() {} void disconnect() const { - boost::std::shared_ptr<detail::connection_body_base> connectionBody(_weak_connection_body.lock()); + boost::shared_ptr<detail::connection_body_base> connectionBody(_weak_connection_body.lock()); if(connectionBody == 0) return; connectionBody->disconnect(); } bool connected() const { - boost::std::shared_ptr<detail::connection_body_base> connectionBody(_weak_connection_body.lock()); + boost::shared_ptr<detail::connection_body_base> connectionBody(_weak_connection_body.lock()); if(connectionBody == 0) return false; return connectionBody->connected(); } bool blocked() const { - boost::std::shared_ptr<detail::connection_body_base> connectionBody(_weak_connection_body.lock()); + boost::shared_ptr<detail::connection_body_base> connectionBody(_weak_connection_body.lock()); if(connectionBody == 0) return true; return connectionBody->blocked(); } bool operator==(const connection& other) const { - boost::std::shared_ptr<detail::connection_body_base> connectionBody(_weak_connection_body.lock()); - boost::std::shared_ptr<detail::connection_body_base> otherConnectionBody(other._weak_connection_body.lock()); + boost::shared_ptr<detail::connection_body_base> connectionBody(_weak_connection_body.lock()); + boost::shared_ptr<detail::connection_body_base> otherConnectionBody(other._weak_connection_body.lock()); return connectionBody == otherConnectionBody; } bool operator!=(const connection& other) const @@ -189,8 +189,8 @@ namespace boost } bool operator<(const connection& other) const { - boost::std::shared_ptr<detail::connection_body_base> connectionBody(_weak_connection_body.lock()); - boost::std::shared_ptr<detail::connection_body_base> otherConnectionBody(other._weak_connection_body.lock()); + boost::shared_ptr<detail::connection_body_base> connectionBody(_weak_connection_body.lock()); + boost::shared_ptr<detail::connection_body_base> otherConnectionBody(other._weak_connection_body.lock()); return connectionBody < otherConnectionBody; } void swap(connection &other) diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/deconstruct.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/deconstruct.hpp index d651fa31..d3eca33c 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/deconstruct.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/deconstruct.hpp @@ -3,8 +3,8 @@ // deconstruct.hpp // -// A factory function for creating a std::shared_ptr which creates -// an object and its owning std::shared_ptr with one allocation, similar +// A factory function for creating a shared_ptr which creates +// an object and its owning shared_ptr with one allocation, similar // to make_shared<T>(). It also supports postconstructors // and predestructors through unqualified calls of adl_postconstruct() and // adl_predestruct, relying on argument-dependent @@ -25,7 +25,7 @@ // for more information #include <boost/config.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/signals2/deconstruct_ptr.hpp> #include <boost/type_traits/alignment_of.hpp> #include <boost/type_traits/remove_const.hpp> @@ -50,11 +50,11 @@ template<typename T> class postconstructor_invoker { public: - operator const std::shared_ptr<T> & () const + operator const shared_ptr<T> & () const { return postconstruct(); } - const std::shared_ptr<T>& postconstruct() const + const shared_ptr<T>& postconstruct() const { if(!_postconstructed) { @@ -65,7 +65,7 @@ public: } #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) template<class... Args> - const std::shared_ptr<T>& postconstruct(Args && ... args) + const shared_ptr<T>& postconstruct(Args && ... args) { if(!_postconstructed) { @@ -77,7 +77,7 @@ public: } #else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) template<typename A1> - const std::shared_ptr<T>& postconstruct(const A1 &a1) const + const shared_ptr<T>& postconstruct(const A1 &a1) const { if(!_postconstructed) { @@ -88,7 +88,7 @@ public: return _sp; } template<typename A1, typename A2> - const std::shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2) const + const shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2) const { if(!_postconstructed) { @@ -99,7 +99,7 @@ public: return _sp; } template<typename A1, typename A2, typename A3> - const std::shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3) const + const shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3) const { if(!_postconstructed) { @@ -110,7 +110,7 @@ public: return _sp; } template<typename A1, typename A2, typename A3, typename A4> - const std::shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4) const + const shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4) const { if(!_postconstructed) { @@ -121,7 +121,7 @@ public: return _sp; } template<typename A1, typename A2, typename A3, typename A4, typename A5> - const std::shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4, const A5 &a5) const + const shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4, const A5 &a5) const { if(!_postconstructed) { @@ -133,7 +133,7 @@ public: } template<typename A1, typename A2, typename A3, typename A4, typename A5, typename A6> - const std::shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4, const A5 &a5, + const shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4, const A5 &a5, const A6 &a6) const { if(!_postconstructed) @@ -146,7 +146,7 @@ public: } template<typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7> - const std::shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4, const A5 &a5, + const shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4, const A5 &a5, const A6 &a6, const A7 &a7) const { if(!_postconstructed) @@ -159,7 +159,7 @@ public: } template<typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8> - const std::shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4, const A5 &a5, + const shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4, const A5 &a5, const A6 &a6, const A7 &a7, const A8 &a8) const { if(!_postconstructed) @@ -172,7 +172,7 @@ public: } template<typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9> - const std::shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4, const A5 &a5, + const shared_ptr<T>& postconstruct(const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4, const A5 &a5, const A6 &a6, const A7 &a7, const A8 &a8, const A9 &a9) const { if(!_postconstructed) @@ -186,10 +186,10 @@ public: #endif // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) private: friend class boost::signals2::deconstruct_access; - postconstructor_invoker(const std::shared_ptr<T> & sp): + postconstructor_invoker(const shared_ptr<T> & sp): _sp(sp), _postconstructed(false) {} - std::shared_ptr<T> _sp; + shared_ptr<T> _sp; mutable bool _postconstructed; }; @@ -269,7 +269,7 @@ public: template< class T > static postconstructor_invoker<T> deconstruct() { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); detail::deconstruct_deleter< T > * pd = boost::get_deleter< detail::deconstruct_deleter< T > >( pt ); @@ -278,7 +278,7 @@ public: new( pv ) T(); pd->set_initialized(); - boost::std::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); + boost::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); boost::detail::sp_enable_shared_from_this(&retval, retval.get(), retval.get()); return retval; @@ -291,7 +291,7 @@ public: template< class T, class... Args > static postconstructor_invoker<T> deconstruct( Args && ... args ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); detail::deconstruct_deleter< T > * pd = boost::get_deleter< detail::deconstruct_deleter< T > >( pt ); @@ -300,7 +300,7 @@ public: new( pv ) T( std::forward<Args>( args )... ); pd->set_initialized(); - boost::std::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); + boost::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); boost::detail::sp_enable_shared_from_this(&retval, retval.get(), retval.get()); return retval; } @@ -310,7 +310,7 @@ public: template< class T, class A1 > static postconstructor_invoker<T> deconstruct( A1 const & a1 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); detail::deconstruct_deleter< T > * pd = boost::get_deleter< detail::deconstruct_deleter< T > >( pt ); @@ -319,7 +319,7 @@ public: new( pv ) T( a1 ); pd->set_initialized(); - boost::std::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); + boost::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); boost::detail::sp_enable_shared_from_this(&retval, retval.get(), retval.get()); return retval; } @@ -327,7 +327,7 @@ public: template< class T, class A1, class A2 > static postconstructor_invoker<T> deconstruct( A1 const & a1, A2 const & a2 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); detail::deconstruct_deleter< T > * pd = boost::get_deleter< detail::deconstruct_deleter< T > >( pt ); @@ -336,7 +336,7 @@ public: new( pv ) T( a1, a2 ); pd->set_initialized(); - boost::std::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); + boost::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); boost::detail::sp_enable_shared_from_this(&retval, retval.get(), retval.get()); return retval; } @@ -344,7 +344,7 @@ public: template< class T, class A1, class A2, class A3 > static postconstructor_invoker<T> deconstruct( A1 const & a1, A2 const & a2, A3 const & a3 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); detail::deconstruct_deleter< T > * pd = boost::get_deleter< detail::deconstruct_deleter< T > >( pt ); @@ -353,7 +353,7 @@ public: new( pv ) T( a1, a2, a3 ); pd->set_initialized(); - boost::std::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); + boost::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); boost::detail::sp_enable_shared_from_this(&retval, retval.get(), retval.get()); return retval; } @@ -361,7 +361,7 @@ public: template< class T, class A1, class A2, class A3, class A4 > static postconstructor_invoker<T> deconstruct( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); detail::deconstruct_deleter< T > * pd = boost::get_deleter< detail::deconstruct_deleter< T > >( pt ); @@ -370,7 +370,7 @@ public: new( pv ) T( a1, a2, a3, a4 ); pd->set_initialized(); - boost::std::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); + boost::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); boost::detail::sp_enable_shared_from_this(&retval, retval.get(), retval.get()); return retval; } @@ -378,7 +378,7 @@ public: template< class T, class A1, class A2, class A3, class A4, class A5 > static postconstructor_invoker<T> deconstruct( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); detail::deconstruct_deleter< T > * pd = boost::get_deleter< detail::deconstruct_deleter< T > >( pt ); @@ -387,7 +387,7 @@ public: new( pv ) T( a1, a2, a3, a4, a5 ); pd->set_initialized(); - boost::std::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); + boost::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); boost::detail::sp_enable_shared_from_this(&retval, retval.get(), retval.get()); return retval; } @@ -395,7 +395,7 @@ public: template< class T, class A1, class A2, class A3, class A4, class A5, class A6 > static postconstructor_invoker<T> deconstruct( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); detail::deconstruct_deleter< T > * pd = boost::get_deleter< detail::deconstruct_deleter< T > >( pt ); @@ -404,7 +404,7 @@ public: new( pv ) T( a1, a2, a3, a4, a5, a6 ); pd->set_initialized(); - boost::std::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); + boost::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); boost::detail::sp_enable_shared_from_this(&retval, retval.get(), retval.get()); return retval; } @@ -412,7 +412,7 @@ public: template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7 > static postconstructor_invoker<T> deconstruct( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); detail::deconstruct_deleter< T > * pd = boost::get_deleter< detail::deconstruct_deleter< T > >( pt ); @@ -421,7 +421,7 @@ public: new( pv ) T( a1, a2, a3, a4, a5, a6, a7 ); pd->set_initialized(); - boost::std::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); + boost::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); boost::detail::sp_enable_shared_from_this(&retval, retval.get(), retval.get()); return retval; } @@ -429,7 +429,7 @@ public: template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 > static postconstructor_invoker<T> deconstruct( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); detail::deconstruct_deleter< T > * pd = boost::get_deleter< detail::deconstruct_deleter< T > >( pt ); @@ -438,7 +438,7 @@ public: new( pv ) T( a1, a2, a3, a4, a5, a6, a7, a8 ); pd->set_initialized(); - boost::std::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); + boost::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); boost::detail::sp_enable_shared_from_this(&retval, retval.get(), retval.get()); return retval; } @@ -446,7 +446,7 @@ public: template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9 > static postconstructor_invoker<T> deconstruct( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8, A9 const & a9 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::deconstruct_deleter< T >() ); detail::deconstruct_deleter< T > * pd = boost::get_deleter< detail::deconstruct_deleter< T > >( pt ); @@ -455,7 +455,7 @@ public: new( pv ) T( a1, a2, a3, a4, a5, a6, a7, a8, a9 ); pd->set_initialized(); - boost::std::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); + boost::shared_ptr< T > retval( pt, static_cast< T* >( pv ) ); boost::detail::sp_enable_shared_from_this(&retval, retval.get(), retval.get()); return retval; } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/deconstruct_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/deconstruct_ptr.hpp index a376c197..841b19b2 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/deconstruct_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/deconstruct_ptr.hpp @@ -1,7 +1,7 @@ // DEPRECATED in favor of adl_postconstruct and adl_predestruct with // deconstruct<T>(). -// A factory function for creating a std::shared_ptr that enhances the plain -// std::shared_ptr constructors by adding support for postconstructors +// A factory function for creating a shared_ptr that enhances the plain +// shared_ptr constructors by adding support for postconstructors // and predestructors through the boost::signals2::postconstructible and // boost::signals2::predestructible base classes. // @@ -19,7 +19,7 @@ #include <boost/checked_delete.hpp> #include <boost/signals2/postconstructible.hpp> #include <boost/signals2/predestructible.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> namespace boost { @@ -63,17 +63,17 @@ namespace boost }; template<typename T> - std::shared_ptr<T> deconstruct_ptr(T *ptr) + shared_ptr<T> deconstruct_ptr(T *ptr) { - if(ptr == 0) return std::shared_ptr<T>(ptr); - std::shared_ptr<T> shared(ptr, boost::signals2::predestructing_deleter<T>()); + if(ptr == 0) return shared_ptr<T>(ptr); + shared_ptr<T> shared(ptr, boost::signals2::predestructing_deleter<T>()); detail::do_postconstruct(ptr); return shared; } template<typename T, typename D> - std::shared_ptr<T> deconstruct_ptr(T *ptr, D deleter) + shared_ptr<T> deconstruct_ptr(T *ptr, D deleter) { - std::shared_ptr<T> shared(ptr, deleter); + shared_ptr<T> shared(ptr, deleter); if(ptr == 0) return shared; detail::do_postconstruct(ptr); return shared; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/detail/foreign_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/detail/foreign_ptr.hpp index a53bb6d4..47c59962 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/detail/foreign_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/detail/foreign_ptr.hpp @@ -1,5 +1,5 @@ -// helper code for dealing with tracking non-boost std::shared_ptr/weak_ptr +// helper code for dealing with tracking non-boost shared_ptr/weak_ptr // Copyright Frank Mori Hess 2009. // Distributed under the Boost Software License, Version @@ -31,7 +31,7 @@ namespace boost { - template<typename T> class std::shared_ptr; + template<typename T> class shared_ptr; template<typename T> class weak_ptr; namespace signals2 @@ -40,7 +40,7 @@ namespace boost {}; template<typename T> struct weak_ptr_traits<boost::weak_ptr<T> > { - typedef boost::std::shared_ptr<T> shared_type; + typedef boost::shared_ptr<T> shared_type; }; #ifndef BOOST_SIGNALS2_NO_CXX11_SMART_PTR template<typename T> struct weak_ptr_traits<std::weak_ptr<T> > @@ -52,7 +52,7 @@ namespace boost template<typename SharedPtr> struct shared_ptr_traits {}; - template<typename T> struct shared_ptr_traits<boost::std::shared_ptr<T> > + template<typename T> struct shared_ptr_traits<boost::shared_ptr<T> > { typedef boost::weak_ptr<T> weak_type; }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/detail/signal_template.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/detail/signal_template.hpp index 8fef5f83..45e70316 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/detail/signal_template.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/detail/signal_template.hpp @@ -112,7 +112,7 @@ namespace boost {} ExtendedSlotFunction _fun; - boost::std::shared_ptr<connection> _connection; + boost::shared_ptr<connection> _connection; }; template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS)> @@ -139,7 +139,7 @@ namespace boost #endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES typedef slot_call_iterator_cache<nonvoid_slot_result_type, slot_invoker> slot_call_iterator_cache_type; typedef typename group_key<Group>::type group_key_type; - typedef std::shared_ptr<connection_body<group_key_type, slot_type, Mutex> > connection_body_type; + typedef shared_ptr<connection_body<group_key_type, slot_type, Mutex> > connection_body_type; typedef grouped_list<Group, GroupCompare, connection_body_type> connection_list_type; typedef BOOST_SIGNALS2_BOUND_EXTENDED_SLOT_FUNCTION_N(BOOST_SIGNALS2_NUM_ARGS)<extended_slot_function_type> bound_extended_slot_function_type; @@ -191,7 +191,7 @@ namespace boost // disconnect slot(s) void disconnect_all_slots() { - std::shared_ptr<invocation_state> local_state = + shared_ptr<invocation_state> local_state = get_readable_state(); typename connection_list_type::iterator it; for(it = local_state->connection_bodies().begin(); @@ -202,7 +202,7 @@ namespace boost } void disconnect(const group_type &group) { - std::shared_ptr<invocation_state> local_state = + shared_ptr<invocation_state> local_state = get_readable_state(); group_key_type group_key(grouped_slots, group); typename connection_list_type::iterator it; @@ -223,7 +223,7 @@ namespace boost // emit signal result_type operator ()(BOOST_SIGNALS2_SIGNATURE_FULL_ARGS(BOOST_SIGNALS2_NUM_ARGS)) { - std::shared_ptr<invocation_state> local_state; + shared_ptr<invocation_state> local_state; typename connection_list_type::iterator it; { unique_lock<mutex_type> list_lock(_mutex); @@ -247,7 +247,7 @@ namespace boost } result_type operator ()(BOOST_SIGNALS2_SIGNATURE_FULL_ARGS(BOOST_SIGNALS2_NUM_ARGS)) const { - std::shared_ptr<invocation_state> local_state; + shared_ptr<invocation_state> local_state; typename connection_list_type::iterator it; { unique_lock<mutex_type> list_lock(_mutex); @@ -271,7 +271,7 @@ namespace boost } std::size_t num_slots() const { - std::shared_ptr<invocation_state> local_state = + shared_ptr<invocation_state> local_state = get_readable_state(); typename connection_list_type::iterator it; std::size_t count = 0; @@ -284,7 +284,7 @@ namespace boost } bool empty() const { - std::shared_ptr<invocation_state> local_state = + shared_ptr<invocation_state> local_state = get_readable_state(); typename connection_list_type::iterator it; for(it = local_state->connection_bodies().begin(); @@ -396,8 +396,8 @@ namespace boost private: invocation_state(const invocation_state &); - std::shared_ptr<connection_list_type> _connection_bodies; - std::shared_ptr<combiner_type> _combiner; + shared_ptr<connection_list_type> _connection_bodies; + shared_ptr<combiner_type> _combiner; }; // Destructor of invocation_janitor does some cleanup when a signal invocation completes. // Code can't be put directly in signal's operator() due to complications from void return types. @@ -500,7 +500,7 @@ namespace boost } nolock_cleanup_connections_from(false, _shared_state->connection_bodies().begin()); } - std::shared_ptr<invocation_state> get_readable_state() const + shared_ptr<invocation_state> get_readable_state() const { unique_lock<mutex_type> list_lock(_mutex); return _shared_state; @@ -517,7 +517,7 @@ namespace boost template<typename T> void do_disconnect(const T &slot, mpl::bool_<false> /* is_group */) { - std::shared_ptr<invocation_state> local_state = + shared_ptr<invocation_state> local_state = get_readable_state(); typename connection_list_type::iterator it; for(it = local_state->connection_bodies().begin(); @@ -576,7 +576,7 @@ namespace boost } // _shared_state is mutable so we can do force_cleanup_connections during a const invocation - mutable std::shared_ptr<invocation_state> _shared_state; + mutable shared_ptr<invocation_state> _shared_state; mutable typename connection_list_type::iterator _garbage_collector_it; // connection list mutex must never be locked when attempting a blocking lock on a slot, // or you could deadlock. @@ -715,12 +715,12 @@ namespace boost return (*_pimpl).set_combiner(combiner_arg); } protected: - virtual std::shared_ptr<void> lock_pimpl() const + virtual shared_ptr<void> lock_pimpl() const { return _pimpl; } private: - std::shared_ptr<impl_class> + shared_ptr<impl_class> _pimpl; }; @@ -747,7 +747,7 @@ namespace boost {} result_type operator ()(BOOST_SIGNALS2_SIGNATURE_FULL_ARGS(BOOST_SIGNALS2_NUM_ARGS)) { - std::shared_ptr<detail::BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) + shared_ptr<detail::BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> > shared_pimpl(_weak_pimpl.lock()); if(shared_pimpl == 0) boost::throw_exception(expired_slot()); @@ -755,7 +755,7 @@ namespace boost } result_type operator ()(BOOST_SIGNALS2_SIGNATURE_FULL_ARGS(BOOST_SIGNALS2_NUM_ARGS)) const { - std::shared_ptr<detail::BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) + shared_ptr<detail::BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> > shared_pimpl(_weak_pimpl.lock()); if(shared_pimpl == 0) boost::throw_exception(expired_slot()); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/postconstructible.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/postconstructible.hpp index 5ee1d82c..faa14444 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/postconstructible.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/postconstructible.hpp @@ -2,7 +2,7 @@ // A simple framework for creating objects with postconstructors. // The objects must inherit from boost::signals2::postconstructible, and // have their lifetimes managed by -// boost::std::shared_ptr created with the boost::signals2::deconstruct_ptr() +// boost::shared_ptr created with the boost::signals2::deconstruct_ptr() // function. // // Copyright Frank Mori Hess 2007-2008. @@ -17,7 +17,7 @@ namespace boost { - template<typename T> class std::shared_ptr; + template<typename T> class shared_ptr; namespace signals2 { @@ -37,7 +37,7 @@ namespace boost public: friend void detail::do_postconstruct(const postconstructible *ptr); template<typename T> - friend void adl_postconstruct(const std::shared_ptr<T> &sp, postconstructible *p) + friend void adl_postconstruct(const shared_ptr<T> &sp, postconstructible *p) { p->postconstruct(); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/predestructible.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/predestructible.hpp index bc7f574c..0f6806dc 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/predestructible.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/predestructible.hpp @@ -2,7 +2,7 @@ // A simple framework for creating objects with predestructors. // The objects must inherit from boost::signals2::predestructible, and // have their lifetimes managed by -// boost::std::shared_ptr created with the boost::signals2::deconstruct_ptr() +// boost::shared_ptr created with the boost::signals2::deconstruct_ptr() // function. // // Copyright Frank Mori Hess 2007-2008. @@ -29,7 +29,7 @@ namespace boost predestructible() {} public: template<typename T> - friend void adl_postconstruct(const std::shared_ptr<T> &, ...) + friend void adl_postconstruct(const shared_ptr<T> &, ...) {} friend void adl_predestruct(predestructible *p) { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/shared_connection_block.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/shared_connection_block.hpp index aa11a90a..c16bf9b9 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/shared_connection_block.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/shared_connection_block.hpp @@ -11,7 +11,7 @@ #ifndef BOOST_SIGNALS2_SHARED_CONNECTION_BLOCK_HPP #define BOOST_SIGNALS2_SHARED_CONNECTION_BLOCK_HPP -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/signals2/connection.hpp> #include <boost/weak_ptr.hpp> @@ -31,7 +31,7 @@ namespace boost void block() { if(blocking()) return; - boost::std::shared_ptr<detail::connection_body_base> connection_body(_weak_connection_body.lock()); + boost::shared_ptr<detail::connection_body_base> connection_body(_weak_connection_body.lock()); if(connection_body == 0) { // Make _blocker non-empty so the blocking() method still returns the correct value @@ -47,7 +47,7 @@ namespace boost } bool blocking() const { - std::shared_ptr<void> empty; + shared_ptr<void> empty; return _blocker < empty || empty < _blocker; } signals2::connection connection() const @@ -56,7 +56,7 @@ namespace boost } private: boost::weak_ptr<detail::connection_body_base> _weak_connection_body; - std::shared_ptr<void> _blocker; + shared_ptr<void> _blocker; }; } } // end namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/signal.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/signal.hpp index f82d541b..4300eeea 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/signal.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/signal.hpp @@ -17,7 +17,7 @@ #include <boost/config.hpp> #include <boost/function.hpp> #include <boost/mpl/identity.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/signals2/connection.hpp> #include <boost/signals2/detail/unique_lock.hpp> #include <boost/signals2/detail/replace_slot_function.hpp> diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/signal_base.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/signal_base.hpp index 31edf33d..05b6b5fd 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/signal_base.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/signal_base.hpp @@ -12,7 +12,7 @@ #define BOOST_SIGNALS2_SIGNAL_BASE_HPP #include <boost/noncopyable.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> namespace boost { namespace signals2 { @@ -25,7 +25,7 @@ namespace boost { virtual ~signal_base() {} protected: - virtual std::shared_ptr<void> lock_pimpl() const = 0; + virtual shared_ptr<void> lock_pimpl() const = 0; }; } // end namespace signals2 } // end namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/slot_base.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/slot_base.hpp index fabc1403..f7f6d39f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/slot_base.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/slot_base.hpp @@ -13,7 +13,7 @@ #define BOOST_SIGNALS2_SLOT_BASE_HPP #include <boost/any.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <boost/signals2/detail/foreign_ptr.hpp> #include <boost/signals2/expired_slot.hpp> @@ -32,7 +32,7 @@ namespace boost class tracked_objects_visitor; typedef boost::variant<boost::weak_ptr<void>, detail::foreign_void_weak_ptr > void_weak_ptr_variant; - typedef boost::variant<boost::std::shared_ptr<void>, detail::foreign_void_shared_ptr > void_shared_ptr_variant; + typedef boost::variant<boost::shared_ptr<void>, detail::foreign_void_shared_ptr > void_shared_ptr_variant; class lock_weak_ptr_visitor { public: diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/trackable.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/trackable.hpp index 1438a0c1..d6a60149 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/trackable.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/signals2/trackable.hpp @@ -17,7 +17,7 @@ #define BOOST_SIGNALS2_TRACKABLE_HPP #include <boost/assert.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> namespace boost { namespace signals2 { @@ -36,12 +36,12 @@ namespace boost { ~trackable() {} private: friend class detail::tracked_objects_visitor; - const std::shared_ptr<void>& get_shared_ptr() const + const shared_ptr<void>& get_shared_ptr() const { return _tracked_ptr; } - std::shared_ptr<void> _tracked_ptr; + shared_ptr<void> _tracked_ptr; }; } // end namespace signals2 } // end namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr.hpp index ec6d2813..b5e569d8 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr.hpp @@ -18,7 +18,7 @@ #include <boost/scoped_ptr.hpp> #include <boost/scoped_array.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/shared_array.hpp> #if !defined(BOOST_NO_MEMBER_TEMPLATES) || defined(BOOST_MSVC6_MEMBER_TEMPLATES) diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/allocate_shared_array.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/allocate_shared_array.hpp index d5be0454..3ee16552 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/allocate_shared_array.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/allocate_shared_array.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_SMART_PTR_ALLOCATE_SHARED_ARRAY_HPP #define BOOST_SMART_PTR_ALLOCATE_SHARED_ARRAY_HPP -#include <boost/smart_ptr/std::shared_ptr.hpp> +#include <boost/smart_ptr/shared_ptr.hpp> #include <boost/smart_ptr/detail/allocate_array_helper.hpp> #include <boost/smart_ptr/detail/array_deleter.hpp> #include <boost/smart_ptr/detail/array_traits.hpp> @@ -29,12 +29,12 @@ namespace boost { std::size_t n1 = size * boost::detail::array_total<T1>::size; boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2); boost::detail::array_deleter<T2[]> d1(n1); - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init(p2); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) template<typename T, typename A, typename... Args> @@ -47,12 +47,12 @@ namespace boost { std::size_t n1 = size * boost::detail::array_total<T1>::size; boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2); boost::detail::array_deleter<T2[]> d1(n1); - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init(p2, boost::detail::sp_forward<Args>(args)...); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } template<typename T, typename A, typename... Args> inline typename boost::detail::sp_if_size_array<T>::type @@ -66,12 +66,12 @@ namespace boost { T2* p2 = 0; boost::detail::allocate_array_helper<A, T2[N]> a1(allocator, &p2); boost::detail::array_deleter<T2[N]> d1; - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[N]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init(p2, boost::detail::sp_forward<Args>(args)...); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } #endif #if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) @@ -89,13 +89,13 @@ namespace boost { T3* p3 = 0; boost::detail::allocate_array_helper<A, T2[N]> a1(allocator, &p2); boost::detail::array_deleter<T2[N]> d1; - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[N]>* D2; p3 = reinterpret_cast<T3*>(list); p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init_list(p2, p3); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } template<typename T, typename A> inline typename boost::detail::sp_if_array<T>::type @@ -113,13 +113,13 @@ namespace boost { std::size_t n1 = M * size; boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2); boost::detail::array_deleter<T2[]> d1(n1); - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[]>* D2; p3 = reinterpret_cast<T3*>(list); p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->template init_list<M>(p2, p3); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } template<typename T, typename A> inline typename boost::detail::sp_if_size_array<T>::type @@ -137,13 +137,13 @@ namespace boost { T3* p3 = 0; boost::detail::allocate_array_helper<A, T2[N]> a1(allocator, &p2); boost::detail::array_deleter<T2[N]> d1; - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[N]>* D2; p3 = reinterpret_cast<T3*>(list); p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->template init_list<M>(p2, p3); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) template<typename T, typename A> @@ -159,13 +159,13 @@ namespace boost { std::size_t n1 = list.size() * boost::detail::array_total<T1>::size; boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2); boost::detail::array_deleter<T2[]> d1(n1); - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[]>* D2; p3 = reinterpret_cast<T3*>(list.begin()); p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init_list(p2, p3); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } #endif #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) @@ -180,12 +180,12 @@ namespace boost { std::size_t n1 = size * boost::detail::array_total<T1>::size; boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2); boost::detail::array_deleter<T2[]> d1(n1); - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init(p2, boost::detail::sp_forward<T2>(value)); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } template<typename T, typename A> inline typename boost::detail::sp_if_size_array<T>::type @@ -200,12 +200,12 @@ namespace boost { T2* p2 = 0; boost::detail::allocate_array_helper<A, T2[N]> a1(allocator, &p2); boost::detail::array_deleter<T2[N]> d1; - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[N]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init(p2, boost::detail::sp_forward<T2>(value)); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } #endif #endif @@ -219,12 +219,12 @@ namespace boost { std::size_t n1 = size * boost::detail::array_total<T1>::size; boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2); boost::detail::array_deleter<T2[]> d1(n1); - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->noinit(p2); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } template<typename T, typename A> inline typename boost::detail::sp_if_size_array<T>::type @@ -238,12 +238,12 @@ namespace boost { T2* p2 = 0; boost::detail::allocate_array_helper<A, T2[N]> a1(allocator, &p2); boost::detail::array_deleter<T2[N]> d1; - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[N]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->noinit(p2); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/detail/shared_ptr_nmt.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/detail/shared_ptr_nmt.hpp index bb3d739c..afc1ec03 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/detail/shared_ptr_nmt.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/detail/shared_ptr_nmt.hpp @@ -2,7 +2,7 @@ #define BOOST_SMART_PTR_DETAIL_SHARED_PTR_NMT_HPP_INCLUDED // -// detail/shared_ptr_nmt.hpp - std::shared_ptr.hpp without member templates +// detail/shared_ptr_nmt.hpp - shared_ptr.hpp without member templates // // (C) Copyright Greg Colvin and Beman Dawes 1998, 1999. // Copyright (c) 2001, 2002 Peter Dimov @@ -11,7 +11,7 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // -// See http://www.boost.org/libs/smart_ptr/std::shared_ptr.htm for documentation. +// See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation. // #include <boost/assert.hpp> @@ -30,7 +30,7 @@ namespace boost { -template<class T> class std::shared_ptr +template<class T> class shared_ptr { private: @@ -41,7 +41,7 @@ public: typedef T element_type; typedef T value_type; - explicit std::shared_ptr(T * p = 0): px(p) + explicit shared_ptr(T * p = 0): px(p) { #ifndef BOOST_NO_EXCEPTIONS @@ -68,7 +68,7 @@ public: #endif } - ~std::shared_ptr() + ~shared_ptr() { if(--*pn == 0) { @@ -77,29 +77,29 @@ public: } } - std::shared_ptr(std::shared_ptr const & r): px(r.px) // never throws + shared_ptr(shared_ptr const & r): px(r.px) // never throws { pn = r.pn; ++*pn; } - std::shared_ptr & operator=(std::shared_ptr const & r) + shared_ptr & operator=(shared_ptr const & r) { - std::shared_ptr(r).swap(*this); + shared_ptr(r).swap(*this); return *this; } #ifndef BOOST_NO_AUTO_PTR - explicit std::shared_ptr(std::auto_ptr<T> & r) - { + explicit shared_ptr(std::auto_ptr<T> & r) + { pn = new count_type(1); // may throw px = r.release(); // fix: moved here to stop leak if new throws - } + } - std::shared_ptr & operator=(std::auto_ptr<T> & r) + shared_ptr & operator=(std::auto_ptr<T> & r) { - std::shared_ptr(r).swap(*this); + shared_ptr(r).swap(*this); return *this; } @@ -108,7 +108,7 @@ public: void reset(T * p = 0) { BOOST_ASSERT(p == 0 || p != px); - std::shared_ptr(p).swap(*this); + shared_ptr(p).swap(*this); } T & operator*() const // never throws @@ -137,8 +137,8 @@ public: { return *pn == 1; } - - void swap(std::shared_ptr<T> & other) // never throws + + void swap(shared_ptr<T> & other) // never throws { std::swap(px, other.px); std::swap(pn, other.pn); @@ -150,29 +150,29 @@ private: count_type * pn; // ptr to reference counter }; -template<class T, class U> inline bool operator==(std::shared_ptr<T> const & a, std::shared_ptr<U> const & b) +template<class T, class U> inline bool operator==(shared_ptr<T> const & a, shared_ptr<U> const & b) { return a.get() == b.get(); } -template<class T, class U> inline bool operator!=(std::shared_ptr<T> const & a, std::shared_ptr<U> const & b) +template<class T, class U> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<U> const & b) { return a.get() != b.get(); } -template<class T> inline bool operator<(std::shared_ptr<T> const & a, std::shared_ptr<T> const & b) +template<class T> inline bool operator<(shared_ptr<T> const & a, shared_ptr<T> const & b) { return std::less<T*>()(a.get(), b.get()); } -template<class T> void swap(std::shared_ptr<T> & a, std::shared_ptr<T> & b) +template<class T> void swap(shared_ptr<T> & a, shared_ptr<T> & b) { a.swap(b); } -// get_pointer() enables boost::mem_fn to recognize std::shared_ptr +// get_pointer() enables boost::mem_fn to recognize shared_ptr -template<class T> inline T * get_pointer(std::shared_ptr<T> const & p) +template<class T> inline T * get_pointer(shared_ptr<T> const & p) { return p.get(); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/detail/sp_if_array.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/detail/sp_if_array.hpp index a364cb55..661e1785 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/detail/sp_if_array.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/detail/sp_if_array.hpp @@ -1,29 +1,29 @@ /* - * Copyright (c) 2012 Glen Joseph Fernandes + * Copyright (c) 2012 Glen Joseph Fernandes * glenfe at live dot com * - * Distributed under the Boost Software License, - * Version 1.0. (See accompanying file LICENSE_1_0.txt + * Distributed under the Boost Software License, + * Version 1.0. (See accompanying file LICENSE_1_0.txt * or copy at http://boost.org/LICENSE_1_0.txt) */ #ifndef BOOST_SMART_PTR_DETAIL_SP_IF_ARRAY_HPP #define BOOST_SMART_PTR_DETAIL_SP_IF_ARRAY_HPP -#include <boost/smart_ptr/std::shared_ptr.hpp> +#include <boost/smart_ptr/shared_ptr.hpp> namespace boost { namespace detail { - template<typename T> + template<typename T> struct sp_if_array; template<typename T> struct sp_if_array<T[]> { - typedef boost::std::shared_ptr<T[]> type; + typedef boost::shared_ptr<T[]> type; }; template<typename T> struct sp_if_size_array; template<typename T, std::size_t N> struct sp_if_size_array<T[N]> { - typedef boost::std::shared_ptr<T[N]> type; + typedef boost::shared_ptr<T[N]> type; }; } } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/detail/spinlock_pool.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/detail/spinlock_pool.hpp index 5d3e9e6a..f09d5c64 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/detail/spinlock_pool.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/detail/spinlock_pool.hpp @@ -17,8 +17,8 @@ // http://www.boost.org/LICENSE_1_0.txt) // // spinlock_pool<0> is reserved for atomic<>, when/if it arrives -// spinlock_pool<1> is reserved for std::shared_ptr reference counts -// spinlock_pool<2> is reserved for std::shared_ptr atomic access +// spinlock_pool<1> is reserved for shared_ptr reference counts +// spinlock_pool<2> is reserved for shared_ptr atomic access // #include <boost/config.hpp> @@ -41,11 +41,11 @@ public: static spinlock & spinlock_for( void const * pv ) { -#if defined(__VMS) && __INITIAL_POINTER_SIZE == 64 +#if defined(__VMS) && __INITIAL_POINTER_SIZE == 64 std::size_t i = reinterpret_cast< unsigned long long >( pv ) % 41; -#else +#else std::size_t i = reinterpret_cast< std::size_t >( pv ) % 41; -#endif +#endif return pool_[ i ]; } @@ -74,14 +74,14 @@ public: template< int I > spinlock spinlock_pool< I >::pool_[ 41 ] = { - BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, - BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, - BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, - BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, - BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, - BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, - BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, - BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, + BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, + BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, + BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, + BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, + BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, + BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, + BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, + BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT, BOOST_DETAIL_SPINLOCK_INIT }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/enable_shared_from_raw.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/enable_shared_from_raw.hpp index 2ebd0466..f659c046 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/enable_shared_from_raw.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/enable_shared_from_raw.hpp @@ -13,19 +13,19 @@ // #include <boost/config.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <boost/assert.hpp> #include <boost/detail/workaround.hpp> namespace boost { -template<typename T> boost::std::shared_ptr<T> shared_from_raw(T *); +template<typename T> boost::shared_ptr<T> shared_from_raw(T *); template<typename T> boost::weak_ptr<T> weak_from_raw(T *); namespace detail { -template< class X, class Y > inline void sp_enable_shared_from_this( boost::std::shared_ptr<X> * ppx, Y const * py, boost::enable_shared_from_raw const * pe ); +template< class X, class Y > inline void sp_enable_shared_from_this( boost::shared_ptr<X> * ppx, Y const * py, boost::enable_shared_from_raw const * pe ); } // namespace detail @@ -48,7 +48,7 @@ protected: ~enable_shared_from_raw() { - BOOST_ASSERT( shared_this_.use_count() <= 1 ); // make sure no dangling std::shared_ptr objects exist + BOOST_ASSERT( shared_this_.use_count() <= 1 ); // make sure no dangling shared_ptr objects exist } private: @@ -66,26 +66,26 @@ private: public: #else private: - template<class Y> friend class std::shared_ptr; - template<typename T> friend boost::std::shared_ptr<T> shared_from_raw(T *); + template<class Y> friend class shared_ptr; + template<typename T> friend boost::shared_ptr<T> shared_from_raw(T *); template<typename T> friend boost::weak_ptr<T> weak_from_raw(T *); - template< class X, class Y > friend inline void detail::sp_enable_shared_from_this( boost::std::shared_ptr<X> * ppx, Y const * py, boost::enable_shared_from_raw const * pe ); + template< class X, class Y > friend inline void detail::sp_enable_shared_from_this( boost::shared_ptr<X> * ppx, Y const * py, boost::enable_shared_from_raw const * pe ); #endif - std::shared_ptr<void> shared_from_this() + shared_ptr<void> shared_from_this() { init_weak_once(); - return std::shared_ptr<void>( weak_this_ ); + return shared_ptr<void>( weak_this_ ); } - std::shared_ptr<const void> shared_from_this() const + shared_ptr<const void> shared_from_this() const { init_weak_once(); - return std::shared_ptr<const void>( weak_this_ ); + return shared_ptr<const void>( weak_this_ ); } - // Note: invoked automatically by std::shared_ptr; do not call - template<class X, class Y> void _internal_accept_owner( std::shared_ptr<X> * ppx, Y * py ) const + // Note: invoked automatically by shared_ptr; do not call + template<class X, class Y> void _internal_accept_owner( shared_ptr<X> * ppx, Y * py ) const { BOOST_ASSERT( ppx != 0 ); @@ -109,14 +109,14 @@ private: mutable weak_ptr<void> weak_this_; private: - mutable std::shared_ptr<void> shared_this_; + mutable shared_ptr<void> shared_this_; }; template<typename T> -boost::std::shared_ptr<T> shared_from_raw(T *p) +boost::shared_ptr<T> shared_from_raw(T *p) { BOOST_ASSERT(p != 0); - return boost::std::shared_ptr<T>(p->enable_shared_from_raw::shared_from_this(), p); + return boost::shared_ptr<T>(p->enable_shared_from_raw::shared_from_this(), p); } template<typename T> @@ -130,7 +130,7 @@ boost::weak_ptr<T> weak_from_raw(T *p) namespace detail { - template< class X, class Y > inline void sp_enable_shared_from_this( boost::std::shared_ptr<X> * ppx, Y const * py, boost::enable_shared_from_raw const * pe ) + template< class X, class Y > inline void sp_enable_shared_from_this( boost::shared_ptr<X> * ppx, Y const * py, boost::enable_shared_from_raw const * pe ) { if( pe != 0 ) { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/enable_shared_from_this.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/enable_shared_from_this.hpp index e0eddd0d..3230f025 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/enable_shared_from_this.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/enable_shared_from_this.hpp @@ -14,7 +14,7 @@ // #include <boost/smart_ptr/weak_ptr.hpp> -#include <boost/smart_ptr/std::shared_ptr.hpp> +#include <boost/smart_ptr/shared_ptr.hpp> #include <boost/assert.hpp> #include <boost/config.hpp> @@ -44,28 +44,28 @@ protected: public: - std::shared_ptr<T> shared_from_this() + shared_ptr<T> shared_from_this() { - std::shared_ptr<T> p( weak_this_ ); + shared_ptr<T> p( weak_this_ ); BOOST_ASSERT( p.get() == this ); return p; } - std::shared_ptr<T const> shared_from_this() const + shared_ptr<T const> shared_from_this() const { - std::shared_ptr<T const> p( weak_this_ ); + shared_ptr<T const> p( weak_this_ ); BOOST_ASSERT( p.get() == this ); return p; } public: // actually private, but avoids compiler template friendship issues - // Note: invoked automatically by std::shared_ptr; do not call - template<class X, class Y> void _internal_accept_owner( std::shared_ptr<X> const * ppx, Y * py ) const + // Note: invoked automatically by shared_ptr; do not call + template<class X, class Y> void _internal_accept_owner( shared_ptr<X> const * ppx, Y * py ) const { if( weak_this_.expired() ) { - weak_this_ = std::shared_ptr<T>( *ppx, py ); + weak_this_ = shared_ptr<T>( *ppx, py ); } } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/make_shared_array.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/make_shared_array.hpp index b8abaf55..eb0578d9 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/make_shared_array.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/make_shared_array.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_SMART_PTR_MAKE_SHARED_ARRAY_HPP #define BOOST_SMART_PTR_MAKE_SHARED_ARRAY_HPP -#include <boost/smart_ptr/std::shared_ptr.hpp> +#include <boost/smart_ptr/shared_ptr.hpp> #include <boost/smart_ptr/detail/array_deleter.hpp> #include <boost/smart_ptr/detail/array_traits.hpp> #include <boost/smart_ptr/detail/make_array_helper.hpp> @@ -29,12 +29,12 @@ namespace boost { std::size_t n1 = size * boost::detail::array_total<T1>::size; boost::detail::make_array_helper<T2[]> a1(n1, &p2); boost::detail::array_deleter<T2[]> d1(n1); - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init(p2); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) template<typename T, typename... Args> @@ -47,12 +47,12 @@ namespace boost { std::size_t n1 = size * boost::detail::array_total<T1>::size; boost::detail::make_array_helper<T2[]> a1(n1, &p2); boost::detail::array_deleter<T2[]> d1(n1); - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init(p2, boost::detail::sp_forward<Args>(args)...); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } template<typename T, typename... Args> inline typename boost::detail::sp_if_size_array<T>::type @@ -66,12 +66,12 @@ namespace boost { T2* p2 = 0; boost::detail::make_array_helper<T2[N]> a1(&p2); boost::detail::array_deleter<T2[N]> d1; - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[N]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init(p2, boost::detail::sp_forward<Args>(args)...); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } #endif #if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) @@ -89,13 +89,13 @@ namespace boost { T3* p3 = 0; boost::detail::make_array_helper<T2[N]> a1(&p2); boost::detail::array_deleter<T2[N]> d1; - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[N]>* D2; p3 = reinterpret_cast<T3*>(list); p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init_list(p2, p3); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } template<typename T> inline typename boost::detail::sp_if_array<T>::type @@ -113,13 +113,13 @@ namespace boost { std::size_t n1 = M * size; boost::detail::make_array_helper<T2[]> a1(n1, &p2); boost::detail::array_deleter<T2[]> d1(n1); - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[]>* D2; p3 = reinterpret_cast<T3*>(list); p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->template init_list<M>(p2, p3); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } template<typename T> inline typename boost::detail::sp_if_size_array<T>::type @@ -136,13 +136,13 @@ namespace boost { T3* p3 = 0; boost::detail::make_array_helper<T2[N]> a1(&p2); boost::detail::array_deleter<T2[N]> d1; - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[N]>* D2; p3 = reinterpret_cast<T3*>(list); p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->template init_list<M>(p2, p3); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) template<typename T> @@ -157,13 +157,13 @@ namespace boost { std::size_t n1 = list.size() * boost::detail::array_total<T1>::size; boost::detail::make_array_helper<T2[]> a1(n1, &p2); boost::detail::array_deleter<T2[]> d1(n1); - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[]>* D2; p3 = reinterpret_cast<T3*>(list.begin()); p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init_list(p2, p3); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } #endif #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) @@ -178,12 +178,12 @@ namespace boost { std::size_t n1 = size * boost::detail::array_total<T1>::size; boost::detail::make_array_helper<T2[]> a1(n1, &p2); boost::detail::array_deleter<T2[]> d1(n1); - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init(p2, boost::detail::sp_forward<T2>(value)); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } template<typename T> inline typename boost::detail::sp_if_size_array<T>::type @@ -197,12 +197,12 @@ namespace boost { T2* p2 = 0; boost::detail::make_array_helper<T2[N]> a1(&p2); boost::detail::array_deleter<T2[N]> d1; - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[N]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->init(p2, boost::detail::sp_forward<T2>(value)); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } #endif #endif @@ -216,12 +216,12 @@ namespace boost { std::size_t n1 = size * boost::detail::array_total<T1>::size; boost::detail::make_array_helper<T2[]> a1(n1, &p2); boost::detail::array_deleter<T2[]> d1(n1); - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->noinit(p2); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } template<typename T> inline typename boost::detail::sp_if_size_array<T>::type @@ -235,12 +235,12 @@ namespace boost { T2* p2 = 0; boost::detail::make_array_helper<T2[N]> a1(&p2); boost::detail::array_deleter<T2[N]> d1; - boost::std::shared_ptr<T> s1(p1, d1, a1); + boost::shared_ptr<T> s1(p1, d1, a1); typedef boost::detail::array_deleter<T2[N]>* D2; p1 = reinterpret_cast<T1*>(p2); D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); d2->noinit(p2); - return boost::std::shared_ptr<T>(s1, p1); + return boost::shared_ptr<T>(s1, p1); } } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/make_shared_object.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/make_shared_object.hpp index 3b4bb108..89a71168 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/make_shared_object.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/make_shared_object.hpp @@ -13,7 +13,7 @@ // for documentation. #include <boost/config.hpp> -#include <boost/smart_ptr/std::shared_ptr.hpp> +#include <boost/smart_ptr/shared_ptr.hpp> #include <boost/smart_ptr/detail/sp_forward.hpp> #include <boost/type_traits/type_with_alignment.hpp> #include <boost/type_traits/alignment_of.hpp> @@ -100,7 +100,7 @@ public: template< class T > struct sp_if_not_array { - typedef boost::std::shared_ptr< T > type; + typedef boost::shared_ptr< T > type; }; #if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) @@ -133,7 +133,7 @@ template< class T, std::size_t N > struct sp_if_not_array< T[N] > template< class T > typename boost::detail::sp_if_not_array< T >::type make_shared() { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -145,12 +145,12 @@ template< class T > typename boost::detail::sp_if_not_array< T >::type make_shar T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T > typename boost::detail::sp_if_not_array< T >::type make_shared_noinit() { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -162,12 +162,12 @@ template< class T > typename boost::detail::sp_if_not_array< T >::type make_shar T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -179,12 +179,12 @@ template< class T, class A > typename boost::detail::sp_if_not_array< T >::type T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A > typename boost::detail::sp_if_not_array< T >::type allocate_shared_noinit( A const & a ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -196,7 +196,7 @@ template< class T, class A > typename boost::detail::sp_if_not_array< T >::type T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } #if !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) @@ -205,7 +205,7 @@ template< class T, class A > typename boost::detail::sp_if_not_array< T >::type template< class T, class Arg1, class... Args > typename boost::detail::sp_if_not_array< T >::type make_shared( Arg1 && arg1, Args && ... args ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -217,12 +217,12 @@ template< class T, class Arg1, class... Args > typename boost::detail::sp_if_not T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class Arg1, class... Args > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, Arg1 && arg1, Args && ... args ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -234,7 +234,7 @@ template< class T, class A, class Arg1, class... Args > typename boost::detail:: T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } #elif !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) @@ -244,7 +244,7 @@ template< class T, class A, class Arg1, class... Args > typename boost::detail:: template< class T, class A1 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -259,19 +259,19 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1 ) T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 && a1 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); - ::new( pv ) T( + ::new( pv ) T( boost::detail::sp_forward<A1>( a1 ) ); @@ -280,20 +280,20 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && a2 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A1>( a1 ), boost::detail::sp_forward<A2>( a2 ) ); @@ -302,20 +302,20 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 && a1, A2 && a2 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); - ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), + ::new( pv ) T( + boost::detail::sp_forward<A1>( a1 ), boost::detail::sp_forward<A2>( a2 ) ); @@ -324,21 +324,21 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && a2, A3 && a3 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), boost::detail::sp_forward<A3>( a3 ) ); @@ -347,21 +347,21 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 && a1, A2 && a2, A3 && a3 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); - ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), + ::new( pv ) T( + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), boost::detail::sp_forward<A3>( a3 ) ); @@ -370,22 +370,22 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3, class A4 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && a2, A3 && a3, A4 && a4 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), - boost::detail::sp_forward<A3>( a3 ), + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A3>( a3 ), boost::detail::sp_forward<A4>( a4 ) ); @@ -394,22 +394,22 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3, class A4 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 && a1, A2 && a2, A3 && a3, A4 && a4 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); - ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), - boost::detail::sp_forward<A3>( a3 ), + ::new( pv ) T( + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A3>( a3 ), boost::detail::sp_forward<A4>( a4 ) ); @@ -418,23 +418,23 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3, class A4, class A5 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), - boost::detail::sp_forward<A3>( a3 ), - boost::detail::sp_forward<A4>( a4 ), + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A3>( a3 ), + boost::detail::sp_forward<A4>( a4 ), boost::detail::sp_forward<A5>( a5 ) ); @@ -443,23 +443,23 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3, class A4, class A5 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); - ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), - boost::detail::sp_forward<A3>( a3 ), - boost::detail::sp_forward<A4>( a4 ), + ::new( pv ) T( + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A3>( a3 ), + boost::detail::sp_forward<A4>( a4 ), boost::detail::sp_forward<A5>( a5 ) ); @@ -468,24 +468,24 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3, class A4, class A5, class A6 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), - boost::detail::sp_forward<A3>( a3 ), - boost::detail::sp_forward<A4>( a4 ), - boost::detail::sp_forward<A5>( a5 ), + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A3>( a3 ), + boost::detail::sp_forward<A4>( a4 ), + boost::detail::sp_forward<A5>( a5 ), boost::detail::sp_forward<A6>( a6 ) ); @@ -494,24 +494,24 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); - ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), - boost::detail::sp_forward<A3>( a3 ), - boost::detail::sp_forward<A4>( a4 ), - boost::detail::sp_forward<A5>( a5 ), + ::new( pv ) T( + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A3>( a3 ), + boost::detail::sp_forward<A4>( a4 ), + boost::detail::sp_forward<A5>( a5 ), boost::detail::sp_forward<A6>( a6 ) ); @@ -520,25 +520,25 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6, A7 && a7 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), - boost::detail::sp_forward<A3>( a3 ), - boost::detail::sp_forward<A4>( a4 ), - boost::detail::sp_forward<A5>( a5 ), - boost::detail::sp_forward<A6>( a6 ), + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A3>( a3 ), + boost::detail::sp_forward<A4>( a4 ), + boost::detail::sp_forward<A5>( a5 ), + boost::detail::sp_forward<A6>( a6 ), boost::detail::sp_forward<A7>( a7 ) ); @@ -547,25 +547,25 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6, class A7 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6, A7 && a7 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); - ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), - boost::detail::sp_forward<A3>( a3 ), - boost::detail::sp_forward<A4>( a4 ), - boost::detail::sp_forward<A5>( a5 ), - boost::detail::sp_forward<A6>( a6 ), + ::new( pv ) T( + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A3>( a3 ), + boost::detail::sp_forward<A4>( a4 ), + boost::detail::sp_forward<A5>( a5 ), + boost::detail::sp_forward<A6>( a6 ), boost::detail::sp_forward<A7>( a7 ) ); @@ -574,26 +574,26 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6, A7 && a7, A8 && a8 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), - boost::detail::sp_forward<A3>( a3 ), - boost::detail::sp_forward<A4>( a4 ), - boost::detail::sp_forward<A5>( a5 ), - boost::detail::sp_forward<A6>( a6 ), - boost::detail::sp_forward<A7>( a7 ), + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A3>( a3 ), + boost::detail::sp_forward<A4>( a4 ), + boost::detail::sp_forward<A5>( a5 ), + boost::detail::sp_forward<A6>( a6 ), + boost::detail::sp_forward<A7>( a7 ), boost::detail::sp_forward<A8>( a8 ) ); @@ -602,26 +602,26 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6, A7 && a7, A8 && a8 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); - ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), - boost::detail::sp_forward<A3>( a3 ), - boost::detail::sp_forward<A4>( a4 ), - boost::detail::sp_forward<A5>( a5 ), - boost::detail::sp_forward<A6>( a6 ), - boost::detail::sp_forward<A7>( a7 ), + ::new( pv ) T( + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A3>( a3 ), + boost::detail::sp_forward<A4>( a4 ), + boost::detail::sp_forward<A5>( a5 ), + boost::detail::sp_forward<A6>( a6 ), + boost::detail::sp_forward<A7>( a7 ), boost::detail::sp_forward<A8>( a8 ) ); @@ -630,27 +630,27 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6, A7 && a7, A8 && a8, A9 && a9 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), - boost::detail::sp_forward<A3>( a3 ), - boost::detail::sp_forward<A4>( a4 ), - boost::detail::sp_forward<A5>( a5 ), - boost::detail::sp_forward<A6>( a6 ), - boost::detail::sp_forward<A7>( a7 ), - boost::detail::sp_forward<A8>( a8 ), + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A3>( a3 ), + boost::detail::sp_forward<A4>( a4 ), + boost::detail::sp_forward<A5>( a5 ), + boost::detail::sp_forward<A6>( a6 ), + boost::detail::sp_forward<A7>( a7 ), + boost::detail::sp_forward<A8>( a8 ), boost::detail::sp_forward<A9>( a9 ) ); @@ -659,27 +659,27 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 && a1, A2 && T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6, A7 && a7, A8 && a8, A9 && a9 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); void * pv = pd->address(); - ::new( pv ) T( - boost::detail::sp_forward<A1>( a1 ), - boost::detail::sp_forward<A2>( a2 ), - boost::detail::sp_forward<A3>( a3 ), - boost::detail::sp_forward<A4>( a4 ), - boost::detail::sp_forward<A5>( a5 ), - boost::detail::sp_forward<A6>( a6 ), - boost::detail::sp_forward<A7>( a7 ), - boost::detail::sp_forward<A8>( a8 ), + ::new( pv ) T( + boost::detail::sp_forward<A1>( a1 ), + boost::detail::sp_forward<A2>( a2 ), + boost::detail::sp_forward<A3>( a3 ), + boost::detail::sp_forward<A4>( a4 ), + boost::detail::sp_forward<A5>( a5 ), + boost::detail::sp_forward<A6>( a6 ), + boost::detail::sp_forward<A7>( a7 ), + boost::detail::sp_forward<A8>( a8 ), boost::detail::sp_forward<A9>( a9 ) ); @@ -688,7 +688,7 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } #else @@ -698,7 +698,7 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, template< class T, class A1 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -710,13 +710,13 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1 ) T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 const & a1 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -728,13 +728,13 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A2 const & a2 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -746,13 +746,13 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 const & a1, A2 const & a2 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -764,13 +764,13 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A2 const & a2, A3 const & a3 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -782,13 +782,13 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -800,13 +800,13 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3, class A4 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -818,13 +818,13 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3, class A4 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -836,13 +836,13 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3, class A4, class A5 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -854,13 +854,13 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3, class A4, class A5 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -872,13 +872,13 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3, class A4, class A5, class A6 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -890,13 +890,13 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -908,13 +908,13 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -926,13 +926,13 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6, class A7 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -944,13 +944,13 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -962,13 +962,13 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -980,13 +980,13 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9 > typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8, A9 const & a9 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -998,13 +998,13 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( A1 const & a1, A T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9 > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8, A9 const & a9 ) { - boost::std::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a ); boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() ); @@ -1016,7 +1016,7 @@ typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, T * pt2 = static_cast< T* >( pv ); boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 ); - return boost::std::shared_ptr< T >( pt, pt2 ); + return boost::shared_ptr< T >( pt, pt2 ); } #endif diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/owner_less.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/owner_less.hpp index f621533d..6899325b 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/owner_less.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/owner_less.hpp @@ -17,7 +17,7 @@ namespace boost { - template<typename T> class std::shared_ptr; + template<typename T> class shared_ptr; template<typename T> class weak_ptr; namespace detail @@ -43,13 +43,13 @@ namespace boost template<typename T> struct owner_less; template<typename T> - struct owner_less<std::shared_ptr<T> >: - public detail::generic_owner_less<std::shared_ptr<T>, weak_ptr<T> > + struct owner_less<shared_ptr<T> >: + public detail::generic_owner_less<shared_ptr<T>, weak_ptr<T> > {}; template<typename T> struct owner_less<weak_ptr<T> >: - public detail::generic_owner_less<weak_ptr<T>, std::shared_ptr<T> > + public detail::generic_owner_less<weak_ptr<T>, shared_ptr<T> > {}; } // namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/scoped_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/scoped_ptr.hpp index 162395db..be6722d5 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/scoped_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/scoped_ptr.hpp @@ -36,7 +36,7 @@ void sp_scalar_destructor_hook(void * p); // scoped_ptr mimics a built-in pointer except that it guarantees deletion // of the object pointed to, either on destruction of the scoped_ptr or via // an explicit reset(). scoped_ptr is a simple solution for simple needs; -// use std::shared_ptr or std::auto_ptr if your needs are more complex. +// use shared_ptr or std::auto_ptr if your needs are more complex. template<class T> class scoped_ptr // noncopyable { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/shared_array.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/shared_array.hpp index bf55aa65..73a07ae1 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/shared_array.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/shared_array.hpp @@ -25,7 +25,7 @@ #include <boost/assert.hpp> #include <boost/checked_delete.hpp> -#include <boost/smart_ptr/std::shared_ptr.hpp> +#include <boost/smart_ptr/shared_ptr.hpp> #include <boost/smart_ptr/detail/shared_count.hpp> #include <boost/smart_ptr/detail/sp_nullptr_t.hpp> #include <boost/detail/workaround.hpp> @@ -40,7 +40,7 @@ namespace boost // // shared_array // -// shared_array extends std::shared_ptr to arrays. +// shared_array extends shared_ptr to arrays. // The array pointed to is deleted when the last shared_array pointing to it // is destroyed or reset. // @@ -195,7 +195,7 @@ public: BOOST_ASSERT(i >= 0); return px[i]; } - + T * get() const BOOST_NOEXCEPT { return px; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/shared_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/shared_ptr.hpp index ea010b16..2f0ce7bc 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/shared_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/shared_ptr.hpp @@ -2,7 +2,7 @@ #define BOOST_SMART_PTR_SHARED_PTR_HPP_INCLUDED // -// std::shared_ptr.hpp +// shared_ptr.hpp // // (C) Copyright Greg Colvin and Beman Dawes 1998, 1999. // Copyright (c) 2001-2008 Peter Dimov @@ -11,7 +11,7 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // -// See http://www.boost.org/libs/smart_ptr/std::shared_ptr.htm for documentation. +// See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation. // #include <boost/config.hpp> // for broken compiler workarounds @@ -22,7 +22,7 @@ // In order to avoid circular dependencies with Boost.TR1 // we make sure that our include of <memory> doesn't try to -// pull in the TR1 headers: that's why we use this header +// pull in the TR1 headers: that's why we use this header // rather than including <memory> directly: #include <boost/config/no_tr1/memory.hpp> // std::auto_ptr @@ -55,7 +55,7 @@ namespace boost { -template<class T> class std::shared_ptr; +template<class T> class shared_ptr; template<class T> class weak_ptr; template<class T> class enable_shared_from_this; class enable_shared_from_raw; @@ -205,7 +205,7 @@ template< class T, std::size_t N > struct sp_extent< T[N] > // enable_shared_from_this support -template< class X, class Y, class T > inline void sp_enable_shared_from_this( boost::std::shared_ptr<X> const * ppx, Y const * py, boost::enable_shared_from_this< T > const * pe ) +template< class X, class Y, class T > inline void sp_enable_shared_from_this( boost::shared_ptr<X> const * ppx, Y const * py, boost::enable_shared_from_this< T > const * pe ) { if( pe != 0 ) { @@ -213,7 +213,7 @@ template< class X, class Y, class T > inline void sp_enable_shared_from_this( bo } } -template< class X, class Y > inline void sp_enable_shared_from_this( boost::std::shared_ptr<X> * ppx, Y const * py, boost::enable_shared_from_raw const * pe ); +template< class X, class Y > inline void sp_enable_shared_from_this( boost::shared_ptr<X> * ppx, Y const * py, boost::enable_shared_from_raw const * pe ); #ifdef _MANAGED @@ -247,7 +247,7 @@ template< class T, class R > struct sp_enable_if_auto_ptr template< class T, class R > struct sp_enable_if_auto_ptr< std::auto_ptr< T >, R > { typedef R type; -}; +}; #endif @@ -271,7 +271,7 @@ template< class Y, class T > inline void sp_assert_convertible() // pointer constructor helper -template< class T, class Y > inline void sp_pointer_construct( boost::std::shared_ptr< T > * ppx, Y * p, boost::detail::shared_count & pn ) +template< class T, class Y > inline void sp_pointer_construct( boost::shared_ptr< T > * ppx, Y * p, boost::detail::shared_count & pn ) { boost::detail::shared_count( p ).swap( pn ); boost::detail::sp_enable_shared_from_this( ppx, p, p ); @@ -279,13 +279,13 @@ template< class T, class Y > inline void sp_pointer_construct( boost::std::share #if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) -template< class T, class Y > inline void sp_pointer_construct( boost::std::shared_ptr< T[] > * /*ppx*/, Y * p, boost::detail::shared_count & pn ) +template< class T, class Y > inline void sp_pointer_construct( boost::shared_ptr< T[] > * /*ppx*/, Y * p, boost::detail::shared_count & pn ) { sp_assert_convertible< Y[], T[] >(); boost::detail::shared_count( p, boost::checked_array_deleter< T >() ).swap( pn ); } -template< class T, std::size_t N, class Y > inline void sp_pointer_construct( boost::std::shared_ptr< T[N] > * /*ppx*/, Y * p, boost::detail::shared_count & pn ) +template< class T, std::size_t N, class Y > inline void sp_pointer_construct( boost::shared_ptr< T[N] > * /*ppx*/, Y * p, boost::detail::shared_count & pn ) { sp_assert_convertible< Y[N], T[N] >(); boost::detail::shared_count( p, boost::checked_array_deleter< T >() ).swap( pn ); @@ -295,19 +295,19 @@ template< class T, std::size_t N, class Y > inline void sp_pointer_construct( bo // deleter constructor helper -template< class T, class Y > inline void sp_deleter_construct( boost::std::shared_ptr< T > * ppx, Y * p ) +template< class T, class Y > inline void sp_deleter_construct( boost::shared_ptr< T > * ppx, Y * p ) { boost::detail::sp_enable_shared_from_this( ppx, p, p ); } #if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) -template< class T, class Y > inline void sp_deleter_construct( boost::std::shared_ptr< T[] > * /*ppx*/, Y * /*p*/ ) +template< class T, class Y > inline void sp_deleter_construct( boost::shared_ptr< T[] > * /*ppx*/, Y * /*p*/ ) { sp_assert_convertible< Y[], T[] >(); } -template< class T, std::size_t N, class Y > inline void sp_deleter_construct( boost::std::shared_ptr< T[N] > * /*ppx*/, Y * /*p*/ ) +template< class T, std::size_t N, class Y > inline void sp_deleter_construct( boost::shared_ptr< T[N] > * /*ppx*/, Y * /*p*/ ) { sp_assert_convertible< Y[N], T[N] >(); } @@ -318,38 +318,38 @@ template< class T, std::size_t N, class Y > inline void sp_deleter_construct( bo // -// std::shared_ptr +// shared_ptr // // An enhanced relative of scoped_ptr with reference counted copy semantics. -// The object pointed to is deleted when the last std::shared_ptr pointing to it +// The object pointed to is deleted when the last shared_ptr pointing to it // is destroyed or reset. // -template<class T> class std::shared_ptr +template<class T> class shared_ptr { private: // Borland 5.5.1 specific workaround - typedef std::shared_ptr<T> this_type; + typedef shared_ptr<T> this_type; public: typedef typename boost::detail::sp_element< T >::type element_type; - std::shared_ptr() BOOST_NOEXCEPT : px( 0 ), pn() // never throws in 1.30+ + shared_ptr() BOOST_NOEXCEPT : px( 0 ), pn() // never throws in 1.30+ { } #if !defined( BOOST_NO_CXX11_NULLPTR ) - std::shared_ptr( boost::detail::sp_nullptr_t ) BOOST_NOEXCEPT : px( 0 ), pn() // never throws + shared_ptr( boost::detail::sp_nullptr_t ) BOOST_NOEXCEPT : px( 0 ), pn() // never throws { } #endif template<class Y> - explicit std::shared_ptr( Y * p ): px( p ), pn() // Y must be complete + explicit shared_ptr( Y * p ): px( p ), pn() // Y must be complete { boost::detail::sp_pointer_construct( this, p, pn ); } @@ -357,17 +357,17 @@ public: // // Requirements: D's copy constructor must not throw // - // std::shared_ptr will release p by calling d(p) + // shared_ptr will release p by calling d(p) // - template<class Y, class D> std::shared_ptr( Y * p, D d ): px( p ), pn( p, d ) + template<class Y, class D> shared_ptr( Y * p, D d ): px( p ), pn( p, d ) { boost::detail::sp_deleter_construct( this, p ); } #if !defined( BOOST_NO_CXX11_NULLPTR ) - template<class D> std::shared_ptr( boost::detail::sp_nullptr_t p, D d ): px( p ), pn( p, d ) + template<class D> shared_ptr( boost::detail::sp_nullptr_t p, D d ): px( p ), pn( p, d ) { } @@ -375,14 +375,14 @@ public: // As above, but with allocator. A's copy constructor shall not throw. - template<class Y, class D, class A> std::shared_ptr( Y * p, D d, A a ): px( p ), pn( p, d, a ) + template<class Y, class D, class A> shared_ptr( Y * p, D d, A a ): px( p ), pn( p, d, a ) { boost::detail::sp_deleter_construct( this, p ); } #if !defined( BOOST_NO_CXX11_NULLPTR ) - template<class D, class A> std::shared_ptr( boost::detail::sp_nullptr_t p, D d, A a ): px( p ), pn( p, d, a ) + template<class D, class A> shared_ptr( boost::detail::sp_nullptr_t p, D d, A a ): px( p ), pn( p, d, a ) { } @@ -394,14 +394,14 @@ public: // ... except in C++0x, move disables the implicit copy - std::shared_ptr( std::shared_ptr const & r ) BOOST_NOEXCEPT : px( r.px ), pn( r.pn ) + shared_ptr( shared_ptr const & r ) BOOST_NOEXCEPT : px( r.px ), pn( r.pn ) { } #endif template<class Y> - explicit std::shared_ptr( weak_ptr<Y> const & r ): pn( r.pn ) // may throw + explicit shared_ptr( weak_ptr<Y> const & r ): pn( r.pn ) // may throw { boost::detail::sp_assert_convertible< Y, T >(); @@ -410,7 +410,7 @@ public: } template<class Y> - std::shared_ptr( weak_ptr<Y> const & r, boost::detail::sp_nothrow_tag ) + shared_ptr( weak_ptr<Y> const & r, boost::detail::sp_nothrow_tag ) BOOST_NOEXCEPT : px( 0 ), pn( r.pn, boost::detail::sp_nothrow_tag() ) { if( !pn.empty() ) @@ -422,11 +422,11 @@ public: template<class Y> #if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) - std::shared_ptr( std::shared_ptr<Y> const & r, typename boost::detail::sp_enable_if_convertible<Y,T>::type = boost::detail::sp_empty() ) + shared_ptr( shared_ptr<Y> const & r, typename boost::detail::sp_enable_if_convertible<Y,T>::type = boost::detail::sp_empty() ) #else - std::shared_ptr( std::shared_ptr<Y> const & r ) + shared_ptr( shared_ptr<Y> const & r ) #endif BOOST_NOEXCEPT : px( r.px ), pn( r.pn ) @@ -436,14 +436,14 @@ public: // aliasing template< class Y > - std::shared_ptr( std::shared_ptr<Y> const & r, element_type * p ) BOOST_NOEXCEPT : px( p ), pn( r.pn ) + shared_ptr( shared_ptr<Y> const & r, element_type * p ) BOOST_NOEXCEPT : px( p ), pn( r.pn ) { } #ifndef BOOST_NO_AUTO_PTR template<class Y> - explicit std::shared_ptr( std::auto_ptr<Y> & r ): px(r.get()), pn() + explicit shared_ptr( std::auto_ptr<Y> & r ): px(r.get()), pn() { boost::detail::sp_assert_convertible< Y, T >(); @@ -456,7 +456,7 @@ public: #if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) template<class Y> - std::shared_ptr( std::auto_ptr<Y> && r ): px(r.get()), pn() + shared_ptr( std::auto_ptr<Y> && r ): px(r.get()), pn() { boost::detail::sp_assert_convertible< Y, T >(); @@ -469,7 +469,7 @@ public: #elif !defined( BOOST_NO_SFINAE ) && !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) template<class Ap> - explicit std::shared_ptr( Ap r, typename boost::detail::sp_enable_if_auto_ptr<Ap, int>::type = 0 ): px( r.get() ), pn() + explicit shared_ptr( Ap r, typename boost::detail::sp_enable_if_auto_ptr<Ap, int>::type = 0 ): px( r.get() ), pn() { typedef typename Ap::element_type Y; @@ -488,7 +488,7 @@ public: #if !defined( BOOST_NO_CXX11_SMART_PTR ) template< class Y, class D > - std::shared_ptr( std::unique_ptr< Y, D > && r ): px( r.get() ), pn() + shared_ptr( std::unique_ptr< Y, D > && r ): px( r.get() ), pn() { boost::detail::sp_assert_convertible< Y, T >(); @@ -502,7 +502,7 @@ public: // assignment - std::shared_ptr & operator=( std::shared_ptr const & r ) BOOST_NOEXCEPT + shared_ptr & operator=( shared_ptr const & r ) BOOST_NOEXCEPT { this_type(r).swap(*this); return *this; @@ -511,7 +511,7 @@ public: #if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1400) template<class Y> - std::shared_ptr & operator=(std::shared_ptr<Y> const & r) BOOST_NOEXCEPT + shared_ptr & operator=(shared_ptr<Y> const & r) BOOST_NOEXCEPT { this_type(r).swap(*this); return *this; @@ -522,7 +522,7 @@ public: #ifndef BOOST_NO_AUTO_PTR template<class Y> - std::shared_ptr & operator=( std::auto_ptr<Y> & r ) + shared_ptr & operator=( std::auto_ptr<Y> & r ) { this_type( r ).swap( *this ); return *this; @@ -531,7 +531,7 @@ public: #if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) template<class Y> - std::shared_ptr & operator=( std::auto_ptr<Y> && r ) + shared_ptr & operator=( std::auto_ptr<Y> && r ) { this_type( static_cast< std::auto_ptr<Y> && >( r ) ).swap( *this ); return *this; @@ -540,7 +540,7 @@ public: #elif !defined( BOOST_NO_SFINAE ) && !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) template<class Ap> - typename boost::detail::sp_enable_if_auto_ptr< Ap, std::shared_ptr & >::type operator=( Ap r ) + typename boost::detail::sp_enable_if_auto_ptr< Ap, shared_ptr & >::type operator=( Ap r ) { this_type( r ).swap( *this ); return *this; @@ -553,7 +553,7 @@ public: #if !defined( BOOST_NO_CXX11_SMART_PTR ) template<class Y, class D> - std::shared_ptr & operator=( std::unique_ptr<Y, D> && r ) + shared_ptr & operator=( std::unique_ptr<Y, D> && r ) { this_type( static_cast< std::unique_ptr<Y, D> && >( r ) ).swap(*this); return *this; @@ -565,7 +565,7 @@ public: #if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) - std::shared_ptr( std::shared_ptr && r ) BOOST_NOEXCEPT : px( r.px ), pn() + shared_ptr( shared_ptr && r ) BOOST_NOEXCEPT : px( r.px ), pn() { pn.swap( r.pn ); r.px = 0; @@ -574,11 +574,11 @@ public: template<class Y> #if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) - std::shared_ptr( std::shared_ptr<Y> && r, typename boost::detail::sp_enable_if_convertible<Y,T>::type = boost::detail::sp_empty() ) + shared_ptr( shared_ptr<Y> && r, typename boost::detail::sp_enable_if_convertible<Y,T>::type = boost::detail::sp_empty() ) #else - std::shared_ptr( std::shared_ptr<Y> && r ) + shared_ptr( shared_ptr<Y> && r ) #endif BOOST_NOEXCEPT : px( r.px ), pn() @@ -589,16 +589,16 @@ public: r.px = 0; } - std::shared_ptr & operator=( std::shared_ptr && r ) BOOST_NOEXCEPT + shared_ptr & operator=( shared_ptr && r ) BOOST_NOEXCEPT { - this_type( static_cast< std::shared_ptr && >( r ) ).swap( *this ); + this_type( static_cast< shared_ptr && >( r ) ).swap( *this ); return *this; } template<class Y> - std::shared_ptr & operator=( std::shared_ptr<Y> && r ) BOOST_NOEXCEPT + shared_ptr & operator=( shared_ptr<Y> && r ) BOOST_NOEXCEPT { - this_type( static_cast< std::shared_ptr<Y> && >( r ) ).swap( *this ); + this_type( static_cast< shared_ptr<Y> && >( r ) ).swap( *this ); return *this; } @@ -606,7 +606,7 @@ public: #if !defined( BOOST_NO_CXX11_NULLPTR ) - std::shared_ptr & operator=( boost::detail::sp_nullptr_t ) BOOST_NOEXCEPT // never throws + shared_ptr & operator=( boost::detail::sp_nullptr_t ) BOOST_NOEXCEPT // never throws { this_type().swap(*this); return *this; @@ -635,25 +635,25 @@ public: this_type( p, d, a ).swap( *this ); } - template<class Y> void reset( std::shared_ptr<Y> const & r, element_type * p ) + template<class Y> void reset( shared_ptr<Y> const & r, element_type * p ) { this_type( r, p ).swap( *this ); } - + // never throws (but has a BOOST_ASSERT in it, so not marked with BOOST_NOEXCEPT) typename boost::detail::sp_dereference< T >::type operator* () const { BOOST_ASSERT( px != 0 ); return *px; } - + // never throws (but has a BOOST_ASSERT in it, so not marked with BOOST_NOEXCEPT) - typename boost::detail::sp_member_access< T >::type operator-> () const + typename boost::detail::sp_member_access< T >::type operator-> () const { BOOST_ASSERT( px != 0 ); return px; } - + // never throws (but has a BOOST_ASSERT in it, so not marked with BOOST_NOEXCEPT) typename boost::detail::sp_array_access< T >::type operator[] ( std::ptrdiff_t i ) const { @@ -681,13 +681,13 @@ public: return pn.use_count(); } - void swap( std::shared_ptr & other ) BOOST_NOEXCEPT + void swap( shared_ptr & other ) BOOST_NOEXCEPT { std::swap(px, other.px); pn.swap(other.pn); } - template<class Y> bool owner_before( std::shared_ptr<Y> const & rhs ) const BOOST_NOEXCEPT + template<class Y> bool owner_before( shared_ptr<Y> const & rhs ) const BOOST_NOEXCEPT { return pn < rhs.pn; } @@ -707,7 +707,7 @@ public: return pn.get_untyped_deleter(); } - bool _internal_equiv( std::shared_ptr const & r ) const BOOST_NOEXCEPT + bool _internal_equiv( shared_ptr const & r ) const BOOST_NOEXCEPT { return px == r.px && pn == r.pn; } @@ -719,7 +719,7 @@ public: private: - template<class Y> friend class std::shared_ptr; + template<class Y> friend class shared_ptr; template<class Y> friend class weak_ptr; @@ -728,14 +728,14 @@ private: element_type * px; // contained pointer boost::detail::shared_count pn; // reference counter -}; // std::shared_ptr +}; // shared_ptr -template<class T, class U> inline bool operator==(std::shared_ptr<T> const & a, std::shared_ptr<U> const & b) BOOST_NOEXCEPT +template<class T, class U> inline bool operator==(shared_ptr<T> const & a, shared_ptr<U> const & b) BOOST_NOEXCEPT { return a.get() == b.get(); } -template<class T, class U> inline bool operator!=(std::shared_ptr<T> const & a, std::shared_ptr<U> const & b) BOOST_NOEXCEPT +template<class T, class U> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<U> const & b) BOOST_NOEXCEPT { return a.get() != b.get(); } @@ -744,7 +744,7 @@ template<class T, class U> inline bool operator!=(std::shared_ptr<T> const & a, // Resolve the ambiguity between our op!= and the one in rel_ops -template<class T> inline bool operator!=(std::shared_ptr<T> const & a, std::shared_ptr<T> const & b) BOOST_NOEXCEPT +template<class T> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<T> const & b) BOOST_NOEXCEPT { return a.get() != b.get(); } @@ -753,81 +753,81 @@ template<class T> inline bool operator!=(std::shared_ptr<T> const & a, std::shar #if !defined( BOOST_NO_CXX11_NULLPTR ) -template<class T> inline bool operator==( std::shared_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_NOEXCEPT +template<class T> inline bool operator==( shared_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_NOEXCEPT { return p.get() == 0; } -template<class T> inline bool operator==( boost::detail::sp_nullptr_t, std::shared_ptr<T> const & p ) BOOST_NOEXCEPT +template<class T> inline bool operator==( boost::detail::sp_nullptr_t, shared_ptr<T> const & p ) BOOST_NOEXCEPT { return p.get() == 0; } -template<class T> inline bool operator!=( std::shared_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_NOEXCEPT +template<class T> inline bool operator!=( shared_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_NOEXCEPT { return p.get() != 0; } -template<class T> inline bool operator!=( boost::detail::sp_nullptr_t, std::shared_ptr<T> const & p ) BOOST_NOEXCEPT +template<class T> inline bool operator!=( boost::detail::sp_nullptr_t, shared_ptr<T> const & p ) BOOST_NOEXCEPT { return p.get() != 0; } #endif -template<class T, class U> inline bool operator<(std::shared_ptr<T> const & a, std::shared_ptr<U> const & b) BOOST_NOEXCEPT +template<class T, class U> inline bool operator<(shared_ptr<T> const & a, shared_ptr<U> const & b) BOOST_NOEXCEPT { return a.owner_before( b ); } -template<class T> inline void swap(std::shared_ptr<T> & a, std::shared_ptr<T> & b) BOOST_NOEXCEPT +template<class T> inline void swap(shared_ptr<T> & a, shared_ptr<T> & b) BOOST_NOEXCEPT { a.swap(b); } -template<class T, class U> std::shared_ptr<T> static_pointer_cast( std::shared_ptr<U> const & r ) BOOST_NOEXCEPT +template<class T, class U> shared_ptr<T> static_pointer_cast( shared_ptr<U> const & r ) BOOST_NOEXCEPT { (void) static_cast< T* >( static_cast< U* >( 0 ) ); - typedef typename std::shared_ptr<T>::element_type E; + typedef typename shared_ptr<T>::element_type E; E * p = static_cast< E* >( r.get() ); - return std::shared_ptr<T>( r, p ); + return shared_ptr<T>( r, p ); } -template<class T, class U> std::shared_ptr<T> const_pointer_cast( std::shared_ptr<U> const & r ) BOOST_NOEXCEPT +template<class T, class U> shared_ptr<T> const_pointer_cast( shared_ptr<U> const & r ) BOOST_NOEXCEPT { (void) const_cast< T* >( static_cast< U* >( 0 ) ); - typedef typename std::shared_ptr<T>::element_type E; + typedef typename shared_ptr<T>::element_type E; E * p = const_cast< E* >( r.get() ); - return std::shared_ptr<T>( r, p ); + return shared_ptr<T>( r, p ); } -template<class T, class U> std::shared_ptr<T> dynamic_pointer_cast( std::shared_ptr<U> const & r ) BOOST_NOEXCEPT +template<class T, class U> shared_ptr<T> dynamic_pointer_cast( shared_ptr<U> const & r ) BOOST_NOEXCEPT { //(void) dynamic_cast< T* >( static_cast< U* >( 0 ) ); // // MGH - TODO - FIX - removed this check, as it was breaking the PS3 compile, and I've no idea why :-s - typedef typename std::shared_ptr<T>::element_type E; + typedef typename shared_ptr<T>::element_type E; E * p = dynamic_cast< E* >( r.get() ); - return p? std::shared_ptr<T>( r, p ): std::shared_ptr<T>(); + return p? shared_ptr<T>( r, p ): shared_ptr<T>(); } -template<class T, class U> std::shared_ptr<T> reinterpret_pointer_cast( std::shared_ptr<U> const & r ) BOOST_NOEXCEPT +template<class T, class U> shared_ptr<T> reinterpret_pointer_cast( shared_ptr<U> const & r ) BOOST_NOEXCEPT { (void) reinterpret_cast< T* >( static_cast< U* >( 0 ) ); - typedef typename std::shared_ptr<T>::element_type E; + typedef typename shared_ptr<T>::element_type E; E * p = reinterpret_cast< E* >( r.get() ); - return std::shared_ptr<T>( r, p ); + return shared_ptr<T>( r, p ); } -// get_pointer() enables boost::mem_fn to recognize std::shared_ptr +// get_pointer() enables boost::mem_fn to recognize shared_ptr -template<class T> inline typename std::shared_ptr<T>::element_type * get_pointer(std::shared_ptr<T> const & p) BOOST_NOEXCEPT +template<class T> inline typename shared_ptr<T>::element_type * get_pointer(shared_ptr<T> const & p) BOOST_NOEXCEPT { return p.get(); } @@ -838,7 +838,7 @@ template<class T> inline typename std::shared_ptr<T>::element_type * get_pointer #if defined(BOOST_NO_TEMPLATED_IOSTREAMS) || ( defined(__GNUC__) && (__GNUC__ < 3) ) -template<class Y> std::ostream & operator<< (std::ostream & os, std::shared_ptr<Y> const & p) +template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p) { os << p.get(); return os; @@ -852,9 +852,9 @@ template<class Y> std::ostream & operator<< (std::ostream & os, std::shared_ptr< # if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1300 && __SGI_STL_PORT) // MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL using std::basic_ostream; -template<class E, class T, class Y> basic_ostream<E, T> & operator<< (basic_ostream<E, T> & os, std::shared_ptr<Y> const & p) +template<class E, class T, class Y> basic_ostream<E, T> & operator<< (basic_ostream<E, T> & os, shared_ptr<Y> const & p) # else -template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, std::shared_ptr<Y> const & p) +template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, shared_ptr<Y> const & p) # endif { os << p.get(); @@ -879,7 +879,7 @@ namespace detail // g++ 2.9x doesn't allow static_cast<X const *>(void *) // apparently EDG 2.38 and HP aCC A.03.35 also don't accept it -template<class D, class T> D * basic_get_deleter(std::shared_ptr<T> const & p) +template<class D, class T> D * basic_get_deleter(shared_ptr<T> const & p) { void const * q = p._internal_get_deleter(BOOST_SP_TYPEID(D)); return const_cast<D *>(static_cast<D const *>(q)); @@ -887,7 +887,7 @@ template<class D, class T> D * basic_get_deleter(std::shared_ptr<T> const & p) #else -template<class D, class T> D * basic_get_deleter( std::shared_ptr<T> const & p ) BOOST_NOEXCEPT +template<class D, class T> D * basic_get_deleter( shared_ptr<T> const & p ) BOOST_NOEXCEPT { return static_cast<D *>( p._internal_get_deleter(BOOST_SP_TYPEID(D)) ); } @@ -898,7 +898,7 @@ class esft2_deleter_wrapper { private: - std::shared_ptr<void> deleter_; + shared_ptr<void> deleter_; public: @@ -906,7 +906,7 @@ public: { } - template< class T > void set_deleter( std::shared_ptr<T> const & deleter ) + template< class T > void set_deleter( shared_ptr<T> const & deleter ) { deleter_ = deleter; } @@ -925,7 +925,7 @@ public: } // namespace detail -template<class D, class T> D * get_deleter( std::shared_ptr<T> const & p ) BOOST_NOEXCEPT +template<class D, class T> D * get_deleter( shared_ptr<T> const & p ) BOOST_NOEXCEPT { D *del = boost::detail::basic_get_deleter<D>(p); @@ -944,34 +944,34 @@ template<class D, class T> D * get_deleter( std::shared_ptr<T> const & p ) BOOST #if !defined(BOOST_SP_NO_ATOMIC_ACCESS) -template<class T> inline bool atomic_is_lock_free( std::shared_ptr<T> const * /*p*/ ) BOOST_NOEXCEPT +template<class T> inline bool atomic_is_lock_free( shared_ptr<T> const * /*p*/ ) BOOST_NOEXCEPT { return false; } -template<class T> std::shared_ptr<T> atomic_load( std::shared_ptr<T> const * p ) +template<class T> shared_ptr<T> atomic_load( shared_ptr<T> const * p ) { boost::detail::spinlock_pool<2>::scoped_lock lock( p ); return *p; } -template<class T> inline std::shared_ptr<T> atomic_load_explicit( std::shared_ptr<T> const * p, memory_order /*mo*/ ) +template<class T> inline shared_ptr<T> atomic_load_explicit( shared_ptr<T> const * p, memory_order /*mo*/ ) { return atomic_load( p ); } -template<class T> void atomic_store( std::shared_ptr<T> * p, std::shared_ptr<T> r ) +template<class T> void atomic_store( shared_ptr<T> * p, shared_ptr<T> r ) { boost::detail::spinlock_pool<2>::scoped_lock lock( p ); p->swap( r ); } -template<class T> inline void atomic_store_explicit( std::shared_ptr<T> * p, std::shared_ptr<T> r, memory_order /*mo*/ ) +template<class T> inline void atomic_store_explicit( shared_ptr<T> * p, shared_ptr<T> r, memory_order /*mo*/ ) { atomic_store( p, r ); // std::move( r ) } -template<class T> std::shared_ptr<T> atomic_exchange( std::shared_ptr<T> * p, std::shared_ptr<T> r ) +template<class T> shared_ptr<T> atomic_exchange( shared_ptr<T> * p, shared_ptr<T> r ) { boost::detail::spinlock & sp = boost::detail::spinlock_pool<2>::spinlock_for( p ); @@ -982,12 +982,12 @@ template<class T> std::shared_ptr<T> atomic_exchange( std::shared_ptr<T> * p, st return r; // return std::move( r ) } -template<class T> std::shared_ptr<T> atomic_exchange_explicit( std::shared_ptr<T> * p, std::shared_ptr<T> r, memory_order /*mo*/ ) +template<class T> shared_ptr<T> atomic_exchange_explicit( shared_ptr<T> * p, shared_ptr<T> r, memory_order /*mo*/ ) { return atomic_exchange( p, r ); // std::move( r ) } -template<class T> bool atomic_compare_exchange( std::shared_ptr<T> * p, std::shared_ptr<T> * v, std::shared_ptr<T> w ) +template<class T> bool atomic_compare_exchange( shared_ptr<T> * p, shared_ptr<T> * v, shared_ptr<T> w ) { boost::detail::spinlock & sp = boost::detail::spinlock_pool<2>::spinlock_for( p ); @@ -1003,7 +1003,7 @@ template<class T> bool atomic_compare_exchange( std::shared_ptr<T> * p, std::sha } else { - std::shared_ptr<T> tmp( *p ); + shared_ptr<T> tmp( *p ); sp.unlock(); @@ -1012,7 +1012,7 @@ template<class T> bool atomic_compare_exchange( std::shared_ptr<T> * p, std::sha } } -template<class T> inline bool atomic_compare_exchange_explicit( std::shared_ptr<T> * p, std::shared_ptr<T> * v, std::shared_ptr<T> w, memory_order /*success*/, memory_order /*failure*/ ) +template<class T> inline bool atomic_compare_exchange_explicit( shared_ptr<T> * p, shared_ptr<T> * v, shared_ptr<T> w, memory_order /*success*/, memory_order /*failure*/ ) { return atomic_compare_exchange( p, v, w ); // std::move( w ) } @@ -1023,7 +1023,7 @@ template<class T> inline bool atomic_compare_exchange_explicit( std::shared_ptr< template< class T > struct hash; -template< class T > std::size_t hash_value( boost::std::shared_ptr<T> const & p ) BOOST_NOEXCEPT +template< class T > std::size_t hash_value( boost::shared_ptr<T> const & p ) BOOST_NOEXCEPT { return boost::hash< T* >()( p.get() ); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/weak_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/weak_ptr.hpp index e30124ad..e3e9ad9b 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/weak_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/smart_ptr/weak_ptr.hpp @@ -15,7 +15,7 @@ #include <memory> // boost.TR1 include order fix #include <boost/smart_ptr/detail/shared_count.hpp> -#include <boost/smart_ptr/std::shared_ptr.hpp> +#include <boost/smart_ptr/shared_ptr.hpp> namespace boost { @@ -124,11 +124,11 @@ public: template<class Y> #if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) - weak_ptr( std::shared_ptr<Y> const & r, typename boost::detail::sp_enable_if_convertible<Y,T>::type = boost::detail::sp_empty() ) + weak_ptr( shared_ptr<Y> const & r, typename boost::detail::sp_enable_if_convertible<Y,T>::type = boost::detail::sp_empty() ) #else - weak_ptr( std::shared_ptr<Y> const & r ) + weak_ptr( shared_ptr<Y> const & r ) #endif BOOST_NOEXCEPT : px( r.px ), pn( r.pn ) @@ -161,7 +161,7 @@ public: #endif template<class Y> - weak_ptr & operator=( std::shared_ptr<Y> const & r ) BOOST_NOEXCEPT + weak_ptr & operator=( shared_ptr<Y> const & r ) BOOST_NOEXCEPT { boost::detail::sp_assert_convertible< Y, T >(); @@ -173,9 +173,9 @@ public: #endif - std::shared_ptr<T> lock() const BOOST_NOEXCEPT + shared_ptr<T> lock() const BOOST_NOEXCEPT { - return std::shared_ptr<T>( *this, boost::detail::sp_nothrow_tag() ); + return shared_ptr<T>( *this, boost::detail::sp_nothrow_tag() ); } long use_count() const BOOST_NOEXCEPT @@ -216,7 +216,7 @@ public: return pn < rhs.pn; } - template<class Y> bool owner_before( std::shared_ptr<Y> const & rhs ) const BOOST_NOEXCEPT + template<class Y> bool owner_before( shared_ptr<Y> const & rhs ) const BOOST_NOEXCEPT { return pn < rhs.pn; } @@ -229,7 +229,7 @@ public: private: template<class Y> friend class weak_ptr; - template<class Y> friend class std::shared_ptr; + template<class Y> friend class shared_ptr; #endif diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp index b3e7b91f..3b25b3d2 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp @@ -147,7 +147,7 @@ struct grammar_definition typedef typename grammar_definition<DerivedT, ScannerT>::type definition_t; typedef grammar_helper<grammar_t, derived_t, scanner_t> helper_t; - typedef boost::std::shared_ptr<helper_t> helper_ptr_t; + typedef boost::shared_ptr<helper_t> helper_ptr_t; typedef boost::weak_ptr<helper_t> helper_weak_ptr_t; grammar_helper* diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp index b5e832b0..822180a9 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp @@ -11,7 +11,7 @@ #define BOOST_SPIRIT_OBJECT_WITH_ID_IPP #include <vector> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #ifdef BOOST_SPIRIT_THREADSAFE #include <boost/thread/mutex.hpp> @@ -64,7 +64,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN static void mutex_init(); #endif - boost::std::shared_ptr<object_with_id_base_supply<IdT> > id_supply; + boost::shared_ptr<object_with_id_base_supply<IdT> > id_supply; }; ////////////////////////////////// @@ -141,7 +141,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN boost::mutex &mutex = mutex_instance(); boost::mutex::scoped_lock lock(mutex); #endif - static boost::std::shared_ptr<object_with_id_base_supply<IdT> > + static boost::shared_ptr<object_with_id_base_supply<IdT> > static_supply; if (!static_supply.get()) @@ -174,7 +174,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN ////////////////////////////////// #ifdef BOOST_SPIRIT_THREADSAFE template <typename TagT, typename IdT> - inline void + inline void object_with_id_base<TagT, IdT>::mutex_init() { mutex_instance(); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/dynamic/stored_rule.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/dynamic/stored_rule.hpp index 81bafd17..5661ef88 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/dynamic/stored_rule.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/dynamic/stored_rule.hpp @@ -12,7 +12,7 @@ #include <boost/spirit/home/classic/namespace.hpp> #include <boost/spirit/home/classic/core/non_terminal/impl/rule.ipp> #include <boost/spirit/home/classic/dynamic/rule_alias.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/spirit/home/classic/dynamic/stored_rule_fwd.hpp> @@ -27,7 +27,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN // /////////////////////////////////////////////////////////////////////////// template < - typename T0 + typename T0 , typename T1 , typename T2 , bool EmbedByValue @@ -113,10 +113,10 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN private: #endif - stored_rule(std::shared_ptr<abstract_parser_t> const& ptr) + stored_rule(shared_ptr<abstract_parser_t> const& ptr) : ptr(ptr) {} - std::shared_ptr<abstract_parser_t> ptr; + shared_ptr<abstract_parser_t> ptr; }; /////////////////////////////////////////////////////////////////////////////// diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/iterator/file_iterator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/iterator/file_iterator.hpp index 9ee354b8..5c20f15f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/iterator/file_iterator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/iterator/file_iterator.hpp @@ -177,7 +177,7 @@ public: inline file_iterator& operator=(const base_t& iter); file_iterator make_end(void); - // operator bool. This borrows a trick from boost::std::shared_ptr to avoid + // operator bool. This borrows a trick from boost::shared_ptr to avoid // to interfere with arithmetic operations. bool operator_bool(void) const { return this->base(); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/iterator/impl/file_iterator.ipp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/iterator/impl/file_iterator.ipp index c9f41aa1..4227b696 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/iterator/impl/file_iterator.ipp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/iterator/impl/file_iterator.ipp @@ -17,7 +17,7 @@ #endif #include <cstdio> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #ifdef BOOST_SPIRIT_FILEITERATOR_WINDOWS # include <boost/type_traits/remove_pointer.hpp> @@ -48,7 +48,7 @@ namespace fileiter_impl { // the base components on which the iterator is built (through the // iterator adaptor library). // -// The opened file stream (FILE) is held with a std::shared_ptr<>, whose +// The opened file stream (FILE) is held with a shared_ptr<>, whose // custom deleter invokes fcose(). This makes the syntax of the class // very easy, especially everything related to copying. // @@ -93,7 +93,7 @@ public: } // Nasty bug in Comeau up to 4.3.0.1, we need explicit boolean context - // for std::shared_ptr to evaluate correctly + // for shared_ptr to evaluate correctly operator bool() const { return m_file ? true : false; } @@ -140,7 +140,7 @@ public: } private: - boost::std::shared_ptr<std::FILE> m_file; + boost::shared_ptr<std::FILE> m_file; std::size_t m_pos; CharT m_curChar; bool m_eof; @@ -236,7 +236,7 @@ public: // a reference is hold by the filemap object). ::CloseHandle(hFile); - // Store the handles inside the std::shared_ptr (with the custom destructors) + // Store the handles inside the shared_ptr (with the custom destructors) m_mem.reset(static_cast<CharT*>(pMem), ::UnmapViewOfFile); // Start of the file @@ -256,7 +256,7 @@ public: } // Nasty bug in Comeau up to 4.3.0.1, we need explicit boolean context - // for std::shared_ptr to evaluate correctly + // for shared_ptr to evaluate correctly operator bool() const { return m_mem ? true : false; } @@ -291,7 +291,7 @@ private: typedef void handle_t; #endif - boost::std::shared_ptr<CharT> m_mem; + boost::shared_ptr<CharT> m_mem; std::size_t m_filesize; CharT* m_curChar; }; @@ -403,7 +403,7 @@ public: } // Nasty bug in Comeau up to 4.3.0.1, we need explicit boolean context - // for std::shared_ptr to evaluate correctly + // for shared_ptr to evaluate correctly operator bool() const { return m_mem ? true : false; } @@ -432,7 +432,7 @@ public: private: - boost::std::shared_ptr<mapping> m_mem; + boost::shared_ptr<mapping> m_mem; CharT const* m_curChar; }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/utility/chset.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/utility/chset.hpp index 62b174cb..36354564 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/utility/chset.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/utility/chset.hpp @@ -10,7 +10,7 @@ #define BOOST_SPIRIT_CHSET_HPP /////////////////////////////////////////////////////////////////////////////// -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/spirit/home/classic/namespace.hpp> #include <boost/spirit/home/classic/core/primitives/primitives.hpp> #include <boost/spirit/home/classic/utility/impl/chset/basic_chset.hpp> @@ -26,7 +26,7 @@ namespace utility { namespace impl { // template functions. And we don't want to put the whole algorithm // in the chset constructor in the class definition. template <typename CharT, typename CharT2> - void construct_chset(boost::std::shared_ptr<basic_chset<CharT> >& ptr, + void construct_chset(boost::shared_ptr<basic_chset<CharT> >& ptr, CharT2 const* definition); }} // namespace utility::impl @@ -84,7 +84,7 @@ public: private: - boost::std::shared_ptr<basic_chset<CharT> > ptr; + boost::shared_ptr<basic_chset<CharT> > ptr; }; /////////////////////////////////////////////////////////////////////////////// diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/utility/impl/chset.ipp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/utility/impl/chset.ipp index a8514a3b..30170351 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/utility/impl/chset.ipp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/classic/utility/impl/chset.ipp @@ -27,16 +27,16 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN namespace utility { namespace impl { template <typename CharT> inline void - detach(boost::std::shared_ptr<basic_chset<CharT> >& ptr) + detach(boost::shared_ptr<basic_chset<CharT> >& ptr) { if (!ptr.unique()) - ptr = boost::std::shared_ptr<basic_chset<CharT> > + ptr = boost::shared_ptr<basic_chset<CharT> > (new basic_chset<CharT>(*ptr)); } template <typename CharT> inline void - detach_clear(boost::std::shared_ptr<basic_chset<CharT> >& ptr) + detach_clear(boost::shared_ptr<basic_chset<CharT> >& ptr) { if (ptr.unique()) ptr->clear(); @@ -45,7 +45,7 @@ namespace utility { namespace impl { } template <typename CharT, typename CharT2> - void construct_chset(boost::std::shared_ptr<basic_chset<CharT> >& ptr, + void construct_chset(boost::shared_ptr<basic_chset<CharT> >& ptr, CharT2 const* definition) { CharT2 ch = *definition++; @@ -76,7 +76,7 @@ namespace utility { namespace impl { #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) template <typename CharT, typename FakeT> - void chset_negated_set(boost::std::shared_ptr<basic_chset<CharT> > &ptr, chlit<CharT> const &ch, + void chset_negated_set(boost::shared_ptr<basic_chset<CharT> > &ptr, chlit<CharT> const &ch, FakeT) { if(ch.ch != (std::numeric_limits<CharT>::min)()) { @@ -86,9 +86,9 @@ namespace utility { namespace impl { ptr->set(ch.ch + 1, (std::numeric_limits<CharT>::max)()); } } - + template <typename CharT, typename FakeT> - void chset_negated_set(boost::std::shared_ptr<basic_chset<CharT> > &ptr, + void chset_negated_set(boost::shared_ptr<basic_chset<CharT> > &ptr, spirit::range<CharT> const &rng, FakeT) { if(rng.first != (std::numeric_limits<CharT>::min)()) { @@ -255,7 +255,7 @@ inline void chset<CharT>::set(negated_char_parser<chlit<CharT> > const& arg_) { utility::impl::detach(ptr); - + if(arg_.positive.ch != (std::numeric_limits<CharT>::min)()) { ptr->set((std::numeric_limits<CharT>::min)(), arg_.positive.ch - 1); } @@ -269,7 +269,7 @@ inline void chset<CharT>::set(negated_char_parser<range<CharT> > const& arg_) { utility::impl::detach(ptr); - + if(arg_.positive.first != (std::numeric_limits<CharT>::min)()) { ptr->set((std::numeric_limits<CharT>::min)(), arg_.positive.first - 1); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/karma/string/symbols.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/karma/string/symbols.hpp index 550154e1..185a280a 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/karma/string/symbols.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/karma/string/symbols.hpp @@ -21,7 +21,7 @@ #include <boost/spirit/home/karma/detail/get_casetag.hpp> #include <boost/spirit/home/karma/detail/string_generate.hpp> #include <boost/config.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/mpl/if.hpp> #include <map> #include <set> @@ -451,7 +451,7 @@ namespace boost { namespace spirit { namespace karma adder add; remover remove; - std::shared_ptr<Lookup> lookup; + shared_ptr<Lookup> lookup; std::string name_; }; @@ -710,7 +710,7 @@ namespace boost { namespace spirit { namespace karma adder add; remover remove; - std::shared_ptr<Lookup> lookup; + shared_ptr<Lookup> lookup; std::string name_; }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/operator/member.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/operator/member.hpp index df5d106c..27f3e8d1 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/operator/member.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/operator/member.hpp @@ -2,7 +2,7 @@ Copyright (c) 2005-2007 Dan Marsden Copyright (c) 2005-2007 Joel de Guzman - Distributed under the Boost Software License, Version 1.0. (See accompanying + Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ==============================================================================*/ @@ -33,8 +33,8 @@ #include <memory> -namespace boost { - template<typename T> class std::shared_ptr; +namespace boost { + template<typename T> class shared_ptr; template<typename T> class scoped_ptr; namespace phoenix { @@ -42,7 +42,7 @@ namespace phoenix { { template<typename T> struct member_type; - + template<typename Class, typename MemberType> struct member_type<MemberType (Class::*)> { @@ -52,7 +52,7 @@ namespace phoenix { namespace meta { - template<typename T> + template<typename T> struct pointed_type; template<typename T> @@ -62,11 +62,11 @@ namespace phoenix { }; template<typename T> - struct pointed_type<std::shared_ptr<T> > + struct pointed_type<shared_ptr<T> > { typedef T type; }; - + template<typename T> struct pointed_type<scoped_ptr<T> > { @@ -116,7 +116,7 @@ namespace phoenix { member_object_eval, actor<T0>, typename as_actor<MemObjPtr>::type>::type> >::type operator->*( - const actor<T0>& ptrActor, + const actor<T0>& ptrActor, MemObjPtr memObjPtr) { return compose<member_object_eval>( diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/qi/string/symbols.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/qi/string/symbols.hpp index b4f9bb1b..a9656f18 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/qi/string/symbols.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/qi/string/symbols.hpp @@ -27,7 +27,7 @@ #include <boost/fusion/include/at.hpp> #include <boost/range.hpp> #include <boost/type_traits/add_reference.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #if defined(BOOST_MSVC) # pragma warning(push) @@ -373,7 +373,7 @@ public: adder add; remover remove; - std::shared_ptr<Lookup> lookup; + shared_ptr<Lookup> lookup; std::string name_; }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/repository/home/qi/operator/detail/keywords.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/repository/home/qi/operator/detail/keywords.hpp index 0beb3871..06836f77 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/repository/home/qi/operator/detail/keywords.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/repository/home/qi/operator/detail/keywords.hpp @@ -15,10 +15,10 @@ #include <boost/fusion/include/at.hpp> namespace boost { namespace spirit { namespace repository { namespace qi { namespace detail { // Variant visitor class which handles dispatching the parsing to the selected parser - // This also handles passing the correct attributes and flags/counters to the subject parsers + // This also handles passing the correct attributes and flags/counters to the subject parsers template<typename T> struct is_distinct : T::distinct { }; - + template<typename T, typename Action> struct is_distinct< spirit::qi::action<T,Action> > : T::distinct { }; @@ -38,22 +38,22 @@ namespace boost { namespace spirit { namespace repository { namespace qi { names typedef Skipper skipper_type; typedef Elements elements_type; - typedef typename add_reference<Attribute>::type attr_reference; + typedef typename add_reference<Attribute>::type attr_reference; public: parse_dispatcher(const Elements &elements,Iterator& first, Iterator const& last , Context& context, Skipper const& skipper - , Flags &flags, Counters &counters, attr_reference attr) : + , Flags &flags, Counters &counters, attr_reference attr) : elements(elements), first(first), last(last) , context(context), skipper(skipper) , flags(flags),counters(counters), attr(attr) {} - + template<typename T> bool operator()(T& idx) const - { + { return call(idx,typename traits::not_is_unused<Attribute>::type()); } - - template <typename Subject,typename Index> + + template <typename Subject,typename Index> bool call_subject_unused( Subject const &subject, Iterator &first, Iterator const &last , Context& context, Skipper const& skipper @@ -62,25 +62,25 @@ namespace boost { namespace spirit { namespace repository { namespace qi { names Iterator save = first; skipper_keyword_marker<Skipper,NoCasePass> marked_skipper(skipper,flags[Index::value],counters[Index::value]); - + if(subject.parse(first,last,context,marked_skipper,unused)) { return true; } save = save; return false; - } - - - template <typename Subject,typename Index> + } + + + template <typename Subject,typename Index> bool call_subject( Subject const &subject, Iterator &first, Iterator const &last , Context& context, Skipper const& skipper , Index& idx ) const { - + Iterator save = first; - skipper_keyword_marker<Skipper,NoCasePass> + skipper_keyword_marker<Skipper,NoCasePass> marked_skipper(skipper,flags[Index::value],counters[Index::value]); if(subject.parse(first,last,context,marked_skipper,fusion::at_c<Index::value>(attr))) { @@ -91,8 +91,8 @@ namespace boost { namespace spirit { namespace repository { namespace qi { names } // Handle unused attributes - template <typename T> bool call(T &idx, mpl::false_) const{ - + template <typename T> bool call(T &idx, mpl::false_) const{ + typedef typename mpl::at<Elements,T>::type ElementType; if( (!is_distinct<ElementType>::value) @@ -114,7 +114,7 @@ namespace boost { namespace spirit { namespace repository { namespace qi { names } return false; } - + const Elements &elements; Iterator &first; const Iterator &last; @@ -132,7 +132,7 @@ namespace boost { namespace spirit { namespace repository { namespace qi { names typedef typename spirit::detail::as_variant< IndexList >::type parser_index_type; - + /////////////////////////////////////////////////////////////////////////// // build_char_type_sequence // @@ -351,7 +351,7 @@ namespace boost { namespace spirit { namespace repository { namespace qi { names { typedef int result_type; - keyword_entry_adder(std::shared_ptr<keywords_type> lookup,FlagsType &flags, Elements &elements) : + keyword_entry_adder(shared_ptr<keywords_type> lookup,FlagsType &flags, Elements &elements) : lookup(lookup) ,flags(flags) ,elements(elements) @@ -421,7 +421,7 @@ namespace boost { namespace spirit { namespace repository { namespace qi { names - std::shared_ptr<keywords_type> lookup; + shared_ptr<keywords_type> lookup; FlagsType & flags; Elements &elements; }; @@ -443,7 +443,7 @@ namespace boost { namespace spirit { namespace repository { namespace qi { names { if(parser_index_type* val_ptr = lookup->find(first,last,first_pass_filter_type())) - { + { if(!apply_visitor(parse_visitor,*val_ptr)){ return false; } @@ -481,7 +481,7 @@ namespace boost { namespace spirit { namespace repository { namespace qi { names } return false; } - std::shared_ptr<keywords_type> lookup; + shared_ptr<keywords_type> lookup; }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/statechart/processor_container.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/statechart/processor_container.hpp index 2b914958..797e2f8f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/statechart/processor_container.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/statechart/processor_container.hpp @@ -15,7 +15,7 @@ #include <boost/ref.hpp> #include <boost/noncopyable.hpp> #include <boost/intrusive_ptr.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <boost/bind.hpp> #include <boost/config.hpp> // BOOST_INTEL @@ -65,7 +65,7 @@ class processor_container : noncopyable { typedef event_processor< Scheduler > processor_base_type; typedef std::auto_ptr< processor_base_type > processor_holder_type; - typedef std::shared_ptr< processor_holder_type > processor_holder_ptr_type; + typedef shared_ptr< processor_holder_type > processor_holder_ptr_type; public: ////////////////////////////////////////////////////////////////////////// @@ -426,8 +426,8 @@ class processor_container : noncopyable } } - typedef std::set< - processor_holder_ptr_type, + typedef std::set< + processor_holder_ptr_type, std::less< processor_holder_ptr_type >, typename boost::detail::allocator::rebind_to< Allocator, processor_holder_ptr_type >::type diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/parameterized_test.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/parameterized_test.hpp index 22b7452d..930dc81a 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/parameterized_test.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/parameterized_test.hpp @@ -1,6 +1,6 @@ // (C) Copyright Gennadiy Rozental 2001-2008. // Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at +// (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -73,7 +73,7 @@ template<typename ParamType, typename ParamIter> class param_test_case_generator : public test_unit_generator { public: param_test_case_generator( callback1<ParamType> const& test_func, - const_string tc_name, + const_string tc_name, ParamIter par_begin, ParamIter par_end ) : m_test_func( test_func ) @@ -110,13 +110,13 @@ struct user_param_tc_method_invoker { typedef void (UserTestCase::*test_method)( ParamType ); // Constructor - user_param_tc_method_invoker( std::shared_ptr<UserTestCase> inst, test_method test_method ) + user_param_tc_method_invoker( shared_ptr<UserTestCase> inst, test_method test_method ) : m_inst( inst ), m_test_method( test_method ) {} void operator()( ParamType p ) { ((*m_inst).*m_test_method)( p ); } // Data members - std::shared_ptr<UserTestCase> m_inst; + shared_ptr<UserTestCase> m_inst; test_method m_test_method; }; @@ -127,7 +127,7 @@ struct user_param_tc_method_invoker { template<typename ParamType, typename ParamIter> inline ut_detail::param_test_case_generator<ParamType,ParamIter> make_test_case( callback1<ParamType> const& test_func, - const_string tc_name, + const_string tc_name, ParamIter par_begin, ParamIter par_end ) { @@ -140,7 +140,7 @@ template<typename ParamType, typename ParamIter> inline ut_detail::param_test_case_generator< BOOST_DEDUCED_TYPENAME remove_const<BOOST_DEDUCED_TYPENAME remove_reference<ParamType>::type>::type,ParamIter> make_test_case( void (*test_func)( ParamType ), - const_string tc_name, + const_string tc_name, ParamIter par_begin, ParamIter par_end ) { @@ -155,13 +155,13 @@ inline ut_detail::param_test_case_generator< BOOST_DEDUCED_TYPENAME remove_const<BOOST_DEDUCED_TYPENAME remove_reference<ParamType>::type>::type,ParamIter> make_test_case( void (UserTestCase::*test_method )( ParamType ), const_string tc_name, - boost::std::shared_ptr<UserTestCase> const& user_test_case, + boost::shared_ptr<UserTestCase> const& user_test_case, ParamIter par_begin, ParamIter par_end ) { typedef BOOST_DEDUCED_TYPENAME remove_const<BOOST_DEDUCED_TYPENAME remove_reference<ParamType>::type>::type param_value_type; - return ut_detail::param_test_case_generator<param_value_type,ParamIter>( - ut_detail::user_param_tc_method_invoker<UserTestCase,ParamType>( user_test_case, test_method ), + return ut_detail::param_test_case_generator<param_value_type,ParamIter>( + ut_detail::user_param_tc_method_invoker<UserTestCase,ParamType>( user_test_case, test_method ), tc_name, par_begin, par_end ); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/predicate_result.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/predicate_result.hpp index 773024e8..16ae4882 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/predicate_result.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/predicate_result.hpp @@ -1,6 +1,6 @@ // (C) Copyright Gennadiy Rozental 2001-2008. // Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at +// (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -21,7 +21,7 @@ #include <boost/test/utils/basic_cstring/basic_cstring.hpp> // Boost -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/detail/workaround.hpp> // STL @@ -46,7 +46,7 @@ class BOOST_TEST_DECL predicate_result { public: // Constructor - predicate_result( bool pv_ ) + predicate_result( bool pv_ ) : p_predicate_value( pv_ ) {} @@ -74,7 +74,7 @@ public: private: // Data members - std::shared_ptr<wrap_stringstream> m_message; + shared_ptr<wrap_stringstream> m_message; }; } // namespace test_tools diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/unit_test_suite_impl.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/unit_test_suite_impl.hpp index 478524a5..993e0560 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/unit_test_suite_impl.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/unit_test_suite_impl.hpp @@ -1,6 +1,6 @@ // (C) Copyright Gennadiy Rozental 2001-2008. // Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at +// (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -25,7 +25,7 @@ #include <boost/test/test_observer.hpp> // Boost -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/mpl/for_each.hpp> #include <boost/mpl/identity.hpp> #include <boost/type.hpp> @@ -70,7 +70,7 @@ public: // Public r/w properties readwrite_property<std::string> p_name; // name for this test unit - readwrite_property<unsigned> p_timeout; // timeout for the test unit execution + readwrite_property<unsigned> p_timeout; // timeout for the test unit execution readwrite_property<counter_t> p_expected_failures; // number of expected failures in this test unit mutable readwrite_property<bool> p_enabled; // enabled status for this unit @@ -140,7 +140,7 @@ public: std::size_t size() const { return m_members.size(); } protected: - friend BOOST_TEST_DECL + friend BOOST_TEST_DECL void traverse_test_tree( test_suite const&, test_tree_visitor& ); friend class framework_impl; virtual ~test_suite() {} @@ -159,8 +159,8 @@ public: , argc( 0 ) , argv( 0 ) {} - - // Data members + + // Data members int argc; char** argv; }; @@ -236,12 +236,12 @@ template<typename InstanceType,typename UserTestCase> struct user_tc_method_invoker { typedef void (UserTestCase::*TestMethod )(); - user_tc_method_invoker( std::shared_ptr<InstanceType> inst, TestMethod test_method ) + user_tc_method_invoker( shared_ptr<InstanceType> inst, TestMethod test_method ) : m_inst( inst ), m_test_method( test_method ) {} void operator()() { ((*m_inst).*m_test_method)(); } - std::shared_ptr<InstanceType> m_inst; + shared_ptr<InstanceType> m_inst; TestMethod m_test_method; }; @@ -261,9 +261,9 @@ template<typename UserTestCase, typename InstanceType> inline test_case* make_test_case( void (UserTestCase::* test_method )(), const_string tc_name, - boost::std::shared_ptr<InstanceType> user_test_case ) + boost::shared_ptr<InstanceType> user_test_case ) { - return new test_case( ut_detail::normalize_test_case_name( tc_name ), + return new test_case( ut_detail::normalize_test_case_name( tc_name ), ut_detail::user_tc_method_invoker<InstanceType,UserTestCase>( user_test_case, test_method ) ); } @@ -299,10 +299,10 @@ struct auto_tc_exp_fail { instance() = this; } - static auto_tc_exp_fail*& instance() + static auto_tc_exp_fail*& instance() { - static auto_tc_exp_fail inst; - static auto_tc_exp_fail* inst_ptr = &inst; + static auto_tc_exp_fail inst; + static auto_tc_exp_fail* inst_ptr = &inst; return inst_ptr; } @@ -322,30 +322,30 @@ private: // ************** global_fixture ************** // // ************************************************************************** // -class BOOST_TEST_DECL global_fixture : public test_observer { -public: +class BOOST_TEST_DECL global_fixture : public test_observer { +public: // Constructor global_fixture(); -}; +}; //____________________________________________________________________________// namespace ut_detail { -template<typename F> +template<typename F> struct global_fixture_impl : public global_fixture { // Constructor global_fixture_impl(): m_fixure( 0 ) {} // test observer interface virtual void test_start( counter_t ) { m_fixure = new F; } - virtual void test_finish() { delete m_fixure; m_fixure = 0; } - virtual void test_aborted() { delete m_fixure; m_fixure = 0; } + virtual void test_finish() { delete m_fixure; m_fixure = 0; } + virtual void test_aborted() { delete m_fixure; m_fixure = 0; } private: // Data members F* m_fixure; -}; +}; // ************************************************************************** // // ************** test_case_template_invoker ************** // @@ -379,7 +379,7 @@ struct generate_test_case_4_type { full_name += " const"; full_name += '>'; - m_holder.m_test_cases.push_back( + m_holder.m_test_cases.push_back( new test_case( full_name, test_case_template_invoker<TestCaseTemplate,TestType>() ) ); } @@ -409,7 +409,7 @@ public: { if( m_test_cases.empty() ) return 0; - + test_unit* res = m_test_cases.front(); m_test_cases.pop_front(); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/callback.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/callback.hpp index f4241225..bd7d3e12 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/callback.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/callback.hpp @@ -1,6 +1,6 @@ // (C) Copyright Gennadiy Rozental 2005-2008. -// Use, modification, and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file +// Use, modification, and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -9,7 +9,7 @@ // // Version : $Revision: 49312 $ // -// Description : +// Description : // *************************************************************************** #ifndef BOOST_TEST_CALLBACK_020505GER @@ -18,7 +18,7 @@ // Boost #include <boost/config.hpp> #include <boost/detail/workaround.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/test/detail/suppress_warnings.hpp> @@ -109,7 +109,7 @@ public: template<typename Functor> callback0( Functor f ) : m_impl( new ut_detail::callback0_impl_t<R,Functor>( f ) ) {} - + void operator=( callback0 const& rhs ) { m_impl = rhs.m_impl; } template<typename Functor> @@ -121,7 +121,7 @@ public: private: // Data members - boost::std::shared_ptr<ut_detail::callback0_impl<R> > m_impl; + boost::shared_ptr<ut_detail::callback0_impl<R> > m_impl; }; // ************************************************************************** // @@ -179,7 +179,7 @@ public: private: // Data members - boost::std::shared_ptr<ut_detail::callback1_impl<R,T1> > m_impl; + boost::shared_ptr<ut_detail::callback1_impl<R,T1> > m_impl; }; // ************************************************************************** // @@ -236,7 +236,7 @@ public: private: // Data members - boost::std::shared_ptr<ut_detail::callback2_impl<R,T1,T2> > m_impl; + boost::shared_ptr<ut_detail::callback2_impl<R,T1,T2> > m_impl; }; // ************************************************************************** // @@ -294,7 +294,7 @@ public: private: // Data members - boost::std::shared_ptr<ut_detail::callback3_impl<R,T1,T2,T3> > m_impl; + boost::shared_ptr<ut_detail::callback3_impl<R,T1,T2,T3> > m_impl; }; } // namespace unit_test diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/basic_parameter.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/basic_parameter.hpp index c98027cd..e7e084cd 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/basic_parameter.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/basic_parameter.hpp @@ -1,6 +1,6 @@ // (C) Copyright Gennadiy Rozental 2005-2008. -// Use, modification, and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file +// Use, modification, and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -40,7 +40,7 @@ template<typename T, typename IdPolicy> class basic_parameter : private base_from_member<IdPolicy>, public typed_parameter<T> { public: // Constructors - explicit basic_parameter( cstring n ) + explicit basic_parameter( cstring n ) : base_from_member<IdPolicy>() , typed_parameter<T>( base_from_member<IdPolicy>::member ) { @@ -61,16 +61,16 @@ public: #define BOOST_RT_CLA_NAMED_PARAM_GENERATORS( param_type ) \ template<typename T> \ -inline std::shared_ptr<param_type ## _t<T> > \ +inline shared_ptr<param_type ## _t<T> > \ param_type( cstring name = cstring() ) \ { \ - return std::shared_ptr<param_type ## _t<T> >( new param_type ## _t<T>( name ) ); \ + return shared_ptr<param_type ## _t<T> >( new param_type ## _t<T>( name ) ); \ } \ \ -inline std::shared_ptr<param_type ## _t<cstring> > \ +inline shared_ptr<param_type ## _t<cstring> > \ param_type( cstring name = cstring() ) \ { \ - return std::shared_ptr<param_type ## _t<cstring> >( new param_type ## _t<cstring>( name ) ); \ + return shared_ptr<param_type ## _t<cstring> >( new param_type ## _t<cstring>( name ) ); \ } \ /**/ diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/char_parameter.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/char_parameter.hpp index ac686e06..3e9b2d84 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/char_parameter.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/char_parameter.hpp @@ -1,6 +1,6 @@ // (C) Copyright Gennadiy Rozental 2005-2008. -// Use, modification, and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file +// Use, modification, and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -66,18 +66,18 @@ public: //____________________________________________________________________________// template<typename T> -inline std::shared_ptr<char_parameter_t<T> > +inline shared_ptr<char_parameter_t<T> > char_parameter( char_type name ) { - return std::shared_ptr<char_parameter_t<T> >( new char_parameter_t<T>( name ) ); + return shared_ptr<char_parameter_t<T> >( new char_parameter_t<T>( name ) ); } //____________________________________________________________________________// -inline std::shared_ptr<char_parameter_t<cstring> > +inline shared_ptr<char_parameter_t<cstring> > char_parameter( char_type name ) { - return std::shared_ptr<char_parameter_t<cstring> >( new char_parameter_t<cstring>( name ) ); + return shared_ptr<char_parameter_t<cstring> >( new char_parameter_t<cstring>( name ) ); } //____________________________________________________________________________// diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/fwd.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/fwd.hpp index 9a351bd0..66d6efc1 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/fwd.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/fwd.hpp @@ -1,6 +1,6 @@ // (C) Copyright Gennadiy Rozental 2005-2008. -// Use, modification, and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file +// Use, modification, and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -19,7 +19,7 @@ #include <boost/test/utils/runtime/config.hpp> // Boost -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> namespace boost { @@ -29,9 +29,9 @@ namespace cla { class parser; class parameter; -typedef std::shared_ptr<parameter> parameter_ptr; +typedef shared_ptr<parameter> parameter_ptr; class naming_policy; -typedef std::shared_ptr<naming_policy> naming_policy_ptr; +typedef shared_ptr<naming_policy> naming_policy_ptr; class argv_traverser; namespace rt_cla_detail { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/parameter.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/parameter.hpp index 46a6aebf..753268a9 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/parameter.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/parameter.hpp @@ -1,6 +1,6 @@ // (C) Copyright Gennadiy Rozental 2005-2008. -// Use, modification, and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file +// Use, modification, and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -88,12 +88,12 @@ public: bool conflict_with( parameter const& p ) const { return (id_2_report() == p.id_2_report() && !id_2_report().is_empty()) || - m_id_policy.conflict_with( p.m_id_policy ) || + m_id_policy.conflict_with( p.m_id_policy ) || ((m_id_policy.p_type_id != p.m_id_policy.p_type_id) && p.m_id_policy.conflict_with( m_id_policy )); } cstring id_2_report() const { return m_id_policy.id_2_report(); } void usage_info( format_stream& fs ) const - { + { m_id_policy.usage_info( fs ); if( p_optional_value ) fs << BOOST_RT_PARAM_LITERAL( '[' ); @@ -131,8 +131,8 @@ private: //____________________________________________________________________________// template<typename Parameter,typename Modifier> -inline std::shared_ptr<Parameter> -operator-( std::shared_ptr<Parameter> p, Modifier const& m ) +inline shared_ptr<Parameter> +operator-( shared_ptr<Parameter> p, Modifier const& m ) { p->accept_modifier( m ); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/parser.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/parser.hpp index a37e7877..5c3c341d 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/parser.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/cla/parser.hpp @@ -1,6 +1,6 @@ // (C) Copyright Gennadiy Rozental 2005-2008. -// Use, modification, and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file +// Use, modification, and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -52,7 +52,7 @@ public: template<typename Param> global_mod_parser const& - operator<<( std::shared_ptr<Param> param ) const + operator<<( shared_ptr<Param> param ) const { param->accept_modifier( m_modifiers ); @@ -103,7 +103,7 @@ public: // arguments access const_argument_ptr operator[]( cstring string_id ) const; - cstring get( cstring string_id ) const; + cstring get( cstring string_id ) const; template<typename T> T const& get( cstring string_id ) const diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/file/config_file_iterator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/file/config_file_iterator.hpp index 8cfe4880..85467f66 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/file/config_file_iterator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/file/config_file_iterator.hpp @@ -1,6 +1,6 @@ // (C) Copyright Gennadiy Rozental 2005-2008. -// Use, modification, and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file +// Use, modification, and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -26,7 +26,7 @@ #include <boost/test/utils/named_params.hpp> // Boost -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> namespace boost { @@ -34,7 +34,7 @@ namespace BOOST_RT_PARAM_NAMESPACE { namespace file { -// Public typedef +// Public typedef typedef std::pair<dstring,long> location; // ************************************************************************** // @@ -154,7 +154,7 @@ private: // Data members struct Impl; - std::shared_ptr<Impl> m_pimpl; + shared_ptr<Impl> m_pimpl; }; } // namespace file diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/fwd.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/fwd.hpp index a4f1a77a..8d298d72 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/fwd.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/fwd.hpp @@ -1,6 +1,6 @@ // (C) Copyright Gennadiy Rozental 2005-2008. // Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at +// (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -19,7 +19,7 @@ #include <boost/test/utils/runtime/config.hpp> // Boost -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> namespace boost { @@ -28,8 +28,8 @@ namespace BOOST_RT_PARAM_NAMESPACE { class parameter; class argument; -typedef std::shared_ptr<argument> argument_ptr; -typedef std::shared_ptr<argument const> const_argument_ptr; +typedef shared_ptr<argument> argument_ptr; +typedef shared_ptr<argument const> const_argument_ptr; template<typename T> class value_interpreter; template<typename T> class typed_argument; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/validation.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/validation.hpp index 2a3f1d02..ff8e4691 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/validation.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/test/utils/runtime/validation.hpp @@ -1,6 +1,6 @@ // (C) Copyright Gennadiy Rozental 2005-2008. // Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at +// (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -22,7 +22,7 @@ #include <boost/test/utils/class_properties.hpp> // Boost -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> // STL #ifdef BOOST_RT_PARAM_EXCEPTION_INHERIT_STD @@ -37,14 +37,14 @@ namespace BOOST_RT_PARAM_NAMESPACE { // ************** runtime::logic_error ************** // // ************************************************************************** // -class logic_error +class logic_error #ifdef BOOST_RT_PARAM_EXCEPTION_INHERIT_STD : public std::exception #endif { - typedef std::shared_ptr<dstring> dstring_ptr; + typedef shared_ptr<dstring> dstring_ptr; public: - // Constructor // !! could we eliminate std::shared_ptr + // Constructor // !! could we eliminate shared_ptr explicit logic_error( cstring msg ) : m_msg( new dstring( msg.begin(), msg.size() ) ) {} ~logic_error() throw() {} diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/thread/future.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/thread/future.hpp index c818c945..de23fda4 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/thread/future.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/thread/future.hpp @@ -26,7 +26,7 @@ #include <boost/thread/lock_algorithms.hpp> #include <boost/thread/lock_types.hpp> #include <boost/exception_ptr.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/scoped_ptr.hpp> #include <boost/type_traits/is_fundamental.hpp> #include <boost/thread/detail/is_convertible.hpp> @@ -236,9 +236,9 @@ namespace boost bool thread_was_interrupted; //#endif #if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION - std::shared_ptr<future_continuation_base> continuation_ptr; + shared_ptr<future_continuation_base> continuation_ptr; #else - std::shared_ptr<void> continuation_ptr; + shared_ptr<void> continuation_ptr; #endif future_object_base(): done(false), @@ -998,11 +998,11 @@ namespace boost struct registered_waiter { - boost::std::shared_ptr<detail::future_object_base> future_; + boost::shared_ptr<detail::future_object_base> future_; detail::future_object_base::waiter_list::iterator wait_iterator; count_type index; - registered_waiter(boost::std::shared_ptr<detail::future_object_base> const& a_future, + registered_waiter(boost::shared_ptr<detail::future_object_base> const& a_future, detail::future_object_base::waiter_list::iterator wait_iterator_, count_type index_): future_(a_future),wait_iterator(wait_iterator_),index(index_) @@ -1236,7 +1236,7 @@ namespace boost { protected: - typedef boost::std::shared_ptr<detail::future_object<R> > future_ptr; + typedef boost::shared_ptr<detail::future_object<R> > future_ptr; future_ptr future_; @@ -1566,7 +1566,7 @@ namespace boost template <typename R> class promise { - typedef boost::std::shared_ptr<detail::future_object<R> > future_ptr; + typedef boost::shared_ptr<detail::future_object<R> > future_ptr; future_ptr future_; bool future_obtained; @@ -1729,7 +1729,7 @@ namespace boost template <typename R> class promise<R&> { - typedef boost::std::shared_ptr<detail::future_object<R&> > future_ptr; + typedef boost::shared_ptr<detail::future_object<R&> > future_ptr; future_ptr future_; bool future_obtained; @@ -1871,7 +1871,7 @@ namespace boost template <> class promise<void> { - typedef boost::std::shared_ptr<detail::future_object<void> > future_ptr; + typedef boost::shared_ptr<detail::future_object<void> > future_ptr; future_ptr future_; bool future_obtained; @@ -1927,7 +1927,7 @@ namespace boost promise(BOOST_THREAD_RV_REF(promise) rhs) BOOST_NOEXCEPT : future_(BOOST_THREAD_RV(rhs).future_),future_obtained(BOOST_THREAD_RV(rhs).future_obtained) { - // we need to release the future as std::shared_ptr doesn't implements move semantics + // we need to release the future as shared_ptr doesn't implements move semantics BOOST_THREAD_RV(rhs).future_.reset(); BOOST_THREAD_RV(rhs).future_obtained=false; } @@ -2461,21 +2461,21 @@ namespace boost template<typename R, typename ...ArgTypes> class packaged_task<R(ArgTypes...)> { - typedef boost::std::shared_ptr<detail::task_base<R(ArgTypes...)> > task_ptr; - boost::std::shared_ptr<detail::task_base<R(ArgTypes...)> > task; + typedef boost::shared_ptr<detail::task_base<R(ArgTypes...)> > task_ptr; + boost::shared_ptr<detail::task_base<R(ArgTypes...)> > task; #else template<typename R> class packaged_task<R()> { - typedef boost::std::shared_ptr<detail::task_base<R()> > task_ptr; - boost::std::shared_ptr<detail::task_base<R()> > task; + typedef boost::shared_ptr<detail::task_base<R()> > task_ptr; + boost::shared_ptr<detail::task_base<R()> > task; #endif #else template<typename R> class packaged_task { - typedef boost::std::shared_ptr<detail::task_base<R> > task_ptr; - boost::std::shared_ptr<detail::task_base<R> > task; + typedef boost::shared_ptr<detail::task_base<R> > task_ptr; + boost::shared_ptr<detail::task_base<R> > task; #endif bool future_obtained; struct dummy; @@ -2806,7 +2806,7 @@ namespace boost BOOST_THREAD_FUTURE<Rp> make_future_deferred_object(BOOST_THREAD_FWD_REF(Fp) f) { - std::shared_ptr<future_deferred_object<Rp, Fp> > + shared_ptr<future_deferred_object<Rp, Fp> > h(new future_deferred_object<Rp, Fp>(boost::forward<Fp>(f))); return BOOST_THREAD_FUTURE<Rp>(h); } @@ -2818,7 +2818,7 @@ namespace boost BOOST_THREAD_FUTURE<Rp> make_future_async_object(BOOST_THREAD_FWD_REF(Fp) f) { - std::shared_ptr<future_async_object<Rp, Fp> > + shared_ptr<future_async_object<Rp, Fp> > h(new future_async_object<Rp, Fp>(boost::forward<Fp>(f))); return BOOST_THREAD_FUTURE<Rp>(h); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/thread/pthread/thread_data.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/thread/pthread/thread_data.hpp index 18dacc0f..5c3b4f02 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/thread/pthread/thread_data.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/thread/pthread/thread_data.hpp @@ -13,7 +13,7 @@ #include <boost/thread/mutex.hpp> #include <boost/thread/pthread/condition_variable_fwd.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/enable_shared_from_this.hpp> #include <boost/optional.hpp> #include <boost/assert.hpp> @@ -87,17 +87,17 @@ namespace boost struct thread_exit_callback_node; struct tss_data_node { - boost::std::shared_ptr<boost::detail::tss_cleanup_function> func; + boost::shared_ptr<boost::detail::tss_cleanup_function> func; void* value; - tss_data_node(boost::std::shared_ptr<boost::detail::tss_cleanup_function> func_, + tss_data_node(boost::shared_ptr<boost::detail::tss_cleanup_function> func_, void* value_): func(func_),value(value_) {} }; struct thread_data_base; - typedef boost::std::shared_ptr<thread_data_base> thread_data_ptr; + typedef boost::shared_ptr<thread_data_base> thread_data_ptr; struct BOOST_THREAD_DECL thread_data_base: enable_shared_from_this<thread_data_base> @@ -121,7 +121,7 @@ namespace boost > notify_list_t; notify_list_t notify; - typedef std::vector<std::shared_ptr<future_object_base> > async_states_t; + typedef std::vector<shared_ptr<future_object_base> > async_states_t; async_states_t async_states_; //#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS @@ -152,7 +152,7 @@ namespace boost notify.push_back(std::pair<condition_variable*, mutex*>(cv, m)); } - void make_ready_at_thread_exit(std::shared_ptr<future_object_base> as) + void make_ready_at_thread_exit(shared_ptr<future_object_base> as) { async_states_.push_back(as); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/thread/tss.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/thread/tss.hpp index e5d518fd..c920024b 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/thread/tss.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/thread/tss.hpp @@ -6,7 +6,7 @@ // (C) Copyright 2007-8 Anthony Williams #include <boost/thread/detail/config.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/thread/detail/thread_heap_alloc.hpp> #include <boost/config/abi_prefix.hpp> @@ -19,11 +19,11 @@ namespace boost { virtual ~tss_cleanup_function() {} - + virtual void operator()(void* data)=0; }; - - BOOST_THREAD_DECL void set_tss_data(void const* key,boost::std::shared_ptr<tss_cleanup_function> func,void* tss_data,bool cleanup_existing); + + BOOST_THREAD_DECL void set_tss_data(void const* key,boost::shared_ptr<tss_cleanup_function> func,void* tss_data,bool cleanup_existing); BOOST_THREAD_DECL void* get_tss_data(void const* key); } @@ -42,16 +42,16 @@ namespace boost delete static_cast<T*>(data); } }; - + struct run_custom_cleanup_function: detail::tss_cleanup_function { void (*cleanup_function)(T*); - + explicit run_custom_cleanup_function(void (*cleanup_function_)(T*)): cleanup_function(cleanup_function_) {} - + void operator()(void* data) { cleanup_function(static_cast<T*>(data)); @@ -59,11 +59,11 @@ namespace boost }; - boost::std::shared_ptr<detail::tss_cleanup_function> cleanup; - + boost::shared_ptr<detail::tss_cleanup_function> cleanup; + public: typedef T element_type; - + thread_specific_ptr(): cleanup(detail::heap_new<delete_data>(),detail::do_heap_delete<delete_data>()) {} @@ -76,7 +76,7 @@ namespace boost } ~thread_specific_ptr() { - detail::set_tss_data(this,boost::std::shared_ptr<detail::tss_cleanup_function>(),0,true); + detail::set_tss_data(this,boost::shared_ptr<detail::tss_cleanup_function>(),0,true); } T* get() const @@ -94,7 +94,7 @@ namespace boost T* release() { T* const temp=get(); - detail::set_tss_data(this,boost::std::shared_ptr<detail::tss_cleanup_function>(),0,false); + detail::set_tss_data(this,boost::shared_ptr<detail::tss_cleanup_function>(),0,false); return temp; } void reset(T* new_value=0) diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/tr1/memory.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/tr1/memory.hpp index 8b50bba3..16908774 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/tr1/memory.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/tr1/memory.hpp @@ -12,23 +12,23 @@ #ifndef BOOST_HAS_TR1_SHARED_PTR // -// This header can get included by boost/std::shared_ptr.hpp which leads +// This header can get included by boost/shared_ptr.hpp which leads // to cyclic dependencies, the workaround is to forward declare all // the boost components, and then include the actual headers afterwards. // This is fragile, but seems to work, and doesn't require modification -// of boost/std::shared_ptr.hpp. +// of boost/shared_ptr.hpp. // namespace boost{ class bad_weak_ptr; template<class T> class weak_ptr; -template<class T> class std::shared_ptr; +template<class T> class shared_ptr; template<class T> void swap(weak_ptr<T> & a, weak_ptr<T> & b) BOOST_NOEXCEPT; -template<class T> void swap(std::shared_ptr<T> & a, std::shared_ptr<T> & b) BOOST_NOEXCEPT; -template<class T, class U> std::shared_ptr<T> static_pointer_cast(std::shared_ptr<U> const & r) BOOST_NOEXCEPT; -template<class T, class U> std::shared_ptr<T> dynamic_pointer_cast(std::shared_ptr<U> const & r) BOOST_NOEXCEPT; -template<class T, class U> std::shared_ptr<T> const_pointer_cast(std::shared_ptr<U> const & r) BOOST_NOEXCEPT; -template<class D, class T> D * get_deleter(std::shared_ptr<T> const & p) BOOST_NOEXCEPT; +template<class T> void swap(shared_ptr<T> & a, shared_ptr<T> & b) BOOST_NOEXCEPT; +template<class T, class U> shared_ptr<T> static_pointer_cast(shared_ptr<U> const & r) BOOST_NOEXCEPT; +template<class T, class U> shared_ptr<T> dynamic_pointer_cast(shared_ptr<U> const & r) BOOST_NOEXCEPT; +template<class T, class U> shared_ptr<T> const_pointer_cast(shared_ptr<U> const & r) BOOST_NOEXCEPT; +template<class D, class T> D * get_deleter(shared_ptr<T> const & p) BOOST_NOEXCEPT; template<class T> class enable_shared_from_this; namespace detail{ @@ -41,7 +41,7 @@ class weak_count; namespace std{ namespace tr1{ using ::boost::bad_weak_ptr; - using ::boost::std::shared_ptr; + using ::boost::shared_ptr; #if !BOOST_WORKAROUND(__BORLANDC__, < 0x0582) using ::boost::swap; #endif @@ -53,7 +53,7 @@ namespace std{ namespace tr1{ using ::boost::enable_shared_from_this; } } -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <boost/enable_shared_from_this.hpp> diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/uuid/random_generator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/uuid/random_generator.hpp index 82fa2e23..0f4a0ab6 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/uuid/random_generator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/uuid/random_generator.hpp @@ -14,7 +14,7 @@ #include <boost/random/variate_generator.hpp> #include <boost/random/mersenne_twister.hpp> #include <boost/assert.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <limits> namespace boost { @@ -34,7 +34,7 @@ private: public: typedef uuid result_type; - + // default constructor creates the random number generator basic_random_generator() : pURNG(new UniformRandomNumberGenerator) @@ -49,7 +49,7 @@ public: // seed the random number generator detail::seed(*pURNG); } - + // keep a reference to a random number generator // don't seed a given random number generator explicit basic_random_generator(UniformRandomNumberGenerator& gen) @@ -62,7 +62,7 @@ public: ) ) {} - + // keep a pointer to a random number generator // don't seed a given random number generator explicit basic_random_generator(UniformRandomNumberGenerator* pGen) @@ -77,11 +77,11 @@ public: { BOOST_ASSERT(pURNG); } - + uuid operator()() { uuid u; - + int i=0; unsigned long random_value = generator(); for (uuid::iterator it=u.begin(); it!=u.end(); ++it, ++i) { @@ -108,7 +108,7 @@ public: } private: - std::shared_ptr<UniformRandomNumberGenerator> pURNG; + shared_ptr<UniformRandomNumberGenerator> pURNG; generator_type generator; }; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/cpp_context.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/cpp_context.hpp index 9d67f4f5..50c1d1ce 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/cpp_context.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/cpp_context.hpp @@ -1,7 +1,7 @@ /*============================================================================= Boost.Wave: A Standard compliant C++ preprocessor library Definition of the preprocessor context - + http://www.boost.org/ Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost @@ -52,10 +52,10 @@ namespace boost { namespace wave { /////////////////////////////////////////////////////////////////////////////// -// +// // The C/C++ preprocessor context template class // -// The boost::wave::context template is the main interface class to +// The boost::wave::context template is the main interface class to // control the behavior of the preprocessing engine. // // The following template parameters has to be supplied: @@ -63,18 +63,18 @@ namespace wave { // IteratorT The iterator type of the underlying input stream // LexIteratorT The lexer iterator type to use as the token factory // InputPolicyT The input policy type to use for loading the files -// to be included. This template parameter is optional and -// defaults to the +// to be included. This template parameter is optional and +// defaults to the // iteration_context_policies::load_file_to_string // type. -// HooksT The hooks policy to use for different notification +// HooksT The hooks policy to use for different notification // callbacks. This template parameter is optional and // defaults to the // context_policies::default_preprocessing_hooks // type. // DerivedT The type of the type being derived from the context // type (if any). This template parameter is optional and -// defaults to 'this_type', which means that the context +// defaults to 'this_type', which means that the context // type will be used assuming no derived type exists. // /////////////////////////////////////////////////////////////////////////////// @@ -83,7 +83,7 @@ struct this_type {}; template < typename IteratorT, - typename LexIteratorT, + typename LexIteratorT, typename InputPolicyT = iteration_context_policies::load_file_to_string, typename HooksT = context_policies::eat_whitespace<typename LexIteratorT::token_type>, typename DerivedT = this_type @@ -113,35 +113,35 @@ public: typedef typename token_type::position_type position_type; // type of a token sequence - typedef std::list<token_type, boost::fast_pool_allocator<token_type> > + typedef std::list<token_type, boost::fast_pool_allocator<token_type> > token_sequence_type; // type of the policies typedef HooksT hook_policy_type; private: -// stack of std::shared_ptr's to the pending iteration contexts - typedef boost::std::shared_ptr<base_iteration_context<context, lexer_type> > +// stack of shared_ptr's to the pending iteration contexts + typedef boost::shared_ptr<base_iteration_context<context, lexer_type> > iteration_ptr_type; - typedef boost::wave::util::iteration_context_stack<iteration_ptr_type> + typedef boost::wave::util::iteration_context_stack<iteration_ptr_type> iteration_context_stack_type; typedef typename iteration_context_stack_type::size_type iter_size_type; context *this_() { return this; } // avoid warning in constructor public: - context(target_iterator_type const &first_, target_iterator_type const &last_, + context(target_iterator_type const &first_, target_iterator_type const &last_, char const *fname = "<Unknown>", HooksT const &hooks_ = HooksT()) : first(first_), last(last_), filename(fname) , has_been_initialized(false) #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0 , current_filename(fname) -#endif +#endif , current_relative_filename(fname) , macros(*this_()) , language(language_support( - support_cpp - | support_option_convert_trigraphs - | support_option_emit_line_directives + support_cpp + | support_option_convert_trigraphs + | support_option_emit_line_directives #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0 | support_option_include_guard_detection #endif @@ -160,29 +160,29 @@ public: // default destructor // iterator interface - iterator_type begin() - { + iterator_type begin() + { std::string fname(filename); if (filename != "<Unknown>" && filename != "<stdin>") { using namespace boost::filesystem; path fpath(util::complete_path(path(filename))); fname = fpath.string(); } - return iterator_type(*this, first, last, position_type(fname.c_str())); + return iterator_type(*this, first, last, position_type(fname.c_str())); } iterator_type begin( - target_iterator_type const &first_, - target_iterator_type const &last_) - { + target_iterator_type const &first_, + target_iterator_type const &last_) + { std::string fname(filename); if (filename != "<Unknown>" && filename != "<stdin>") { using namespace boost::filesystem; path fpath(util::complete_path(path(filename))); fname = fpath.string(); } - return iterator_type(*this, first_, last_, position_type(fname.c_str())); + return iterator_type(*this, first_, last_, position_type(fname.c_str())); } - iterator_type end() const + iterator_type end() const { return iterator_type(); } // maintain include paths @@ -191,46 +191,46 @@ public: bool add_sysinclude_path(char const *path_) { return includes.add_include_path(path_, true);} void set_sysinclude_delimiter() { includes.set_sys_include_delimiter(); } - typename iteration_context_stack_type::size_type get_iteration_depth() const + typename iteration_context_stack_type::size_type get_iteration_depth() const { return iter_ctxs.size(); } // maintain defined macros #if BOOST_WAVE_ENABLE_COMMANDLINE_MACROS != 0 template <typename StringT> bool add_macro_definition(StringT macrostring, bool is_predefined = false) - { - return boost::wave::util::add_macro_definition(*this, - util::to_string<std::string>(macrostring), is_predefined, - get_language()); + { + return boost::wave::util::add_macro_definition(*this, + util::to_string<std::string>(macrostring), is_predefined, + get_language()); } -#endif +#endif // Define and undefine macros, macro introspection template <typename StringT> - bool add_macro_definition(StringT const &name, position_type const& pos, - bool has_params, std::vector<token_type> ¶meters, + bool add_macro_definition(StringT const &name, position_type const& pos, + bool has_params, std::vector<token_type> ¶meters, token_sequence_type &definition, bool is_predefined = false) - { + { return macros.add_macro( - token_type(T_IDENTIFIER, util::to_string<string_type>(name), pos), - has_params, parameters, definition, is_predefined); + token_type(T_IDENTIFIER, util::to_string<string_type>(name), pos), + has_params, parameters, definition, is_predefined); } template <typename StringT> bool is_defined_macro(StringT const &str) const - { - return macros.is_defined(util::to_string<string_type>(str)); + { + return macros.is_defined(util::to_string<string_type>(str)); } template <typename StringT> - bool get_macro_definition(StringT const &name, + bool get_macro_definition(StringT const &name, bool &has_params, bool &is_predefined, position_type &pos, - std::vector<token_type> ¶meters, + std::vector<token_type> ¶meters, token_sequence_type &definition) const - { - return macros.get_macro(util::to_string<string_type>(name), - has_params, is_predefined, pos, parameters, definition); + { + return macros.get_macro(util::to_string<string_type>(name), + has_params, is_predefined, pos, parameters, definition); } template <typename StringT> bool remove_macro_definition(StringT const& undefname, bool even_predefined = false) - { + { // strip leading and trailing whitespace string_type name = util::to_string<string_type>(undefname); typename string_type::size_type pos = name.find_first_not_of(" \t"); @@ -244,9 +244,9 @@ public: includes.remove_pragma_once_header( util::to_string<std::string>(name)); #endif - return macros.remove_macro(name, macros.get_main_pos(), even_predefined); + return macros.remove_macro(name, macros.get_main_pos(), even_predefined); } - void reset_macro_definitions() + void reset_macro_definitions() { macros.reset_macromap(); macros.init_predefined_macros(); } // Iterate over names of defined macros @@ -264,28 +264,28 @@ public: bool add_macro_definition(token_type const &name, bool has_params, std::vector<token_type> ¶meters, token_sequence_type &definition, bool is_predefined = false) - { - return macros.add_macro(name, has_params, parameters, definition, - is_predefined); + { + return macros.add_macro(name, has_params, parameters, definition, + is_predefined); } -// get the Wave version information - static std::string get_version() - { - boost::wave::util::predefined_macros p; - return util::to_string<std::string>(p.get_fullversion()); +// get the Wave version information + static std::string get_version() + { + boost::wave::util::predefined_macros p; + return util::to_string<std::string>(p.get_fullversion()); } - static std::string get_version_string() + static std::string get_version_string() { boost::wave::util::predefined_macros p; - return util::to_string<std::string>(p.get_versionstr()); + return util::to_string<std::string>(p.get_versionstr()); } // access current language options void set_language(boost::wave::language_support language_, - bool reset_macros = true) - { - language = language_; + bool reset_macros = true) + { + language = language_; if (reset_macros) reset_macro_definitions(); } @@ -305,10 +305,10 @@ public: hook_policy_type const &get_hooks() const { return hooks; } // return type of actually used context type (might be the derived type) - actual_context_type& derived() - { return *static_cast<actual_context_type*>(this); } + actual_context_type& derived() + { return *static_cast<actual_context_type*>(this); } actual_context_type const& derived() const - { return *static_cast<actual_context_type const*>(this); } + { return *static_cast<actual_context_type const*>(this); } // return the directory of the currently preprocessed file boost::filesystem::path get_current_directory() const @@ -320,7 +320,7 @@ protected: friend class boost::wave::impl::pp_iterator_functor<context>; #endif -// make sure the context has been initialized +// make sure the context has been initialized void init_context() { if (!has_been_initialized) { @@ -340,22 +340,22 @@ protected: { return macros.is_defined(begin, end); } // maintain include paths (helper functions) - void set_current_directory(char const *path_) + void set_current_directory(char const *path_) { includes.set_current_directory(path_); } // conditional compilation contexts bool get_if_block_status() const { return ifblocks.get_status(); } - bool get_if_block_some_part_status() const - { return ifblocks.get_some_part_status(); } + bool get_if_block_some_part_status() const + { return ifblocks.get_some_part_status(); } bool get_enclosing_if_block_status() const { return ifblocks.get_enclosing_status(); } - void enter_if_block(bool new_status) + void enter_if_block(bool new_status) { ifblocks.enter_if_block(new_status); } - bool enter_elif_block(bool new_status) + bool enter_elif_block(bool new_status) { return ifblocks.enter_elif_block(new_status); } bool enter_else_block() { return ifblocks.enter_else_block(); } bool exit_if_block() { return ifblocks.exit_if_block(); } - typename boost::wave::util::if_block_stack::size_type get_if_block_depth() const + typename boost::wave::util::if_block_stack::size_type get_if_block_depth() const { return ifblocks.get_if_block_depth(); } // stack of iteration contexts @@ -366,29 +366,29 @@ protected: /////////////////////////////////////////////////////////////////////////////// // -// expand_tokensequence(): -// expands all macros contained in a given token sequence, handles '##' -// and '#' pp operators and re-scans the resulting sequence +// expand_tokensequence(): +// expands all macros contained in a given token sequence, handles '##' +// and '#' pp operators and re-scans the resulting sequence // (essentially pre-processes the token sequence). // // The expand_undefined parameter is true during macro expansion inside -// a C++ expression given for a #if or #elif statement. +// a C++ expression given for a #if or #elif statement. // /////////////////////////////////////////////////////////////////////////////// template <typename IteratorT2> - token_type expand_tokensequence(IteratorT2 &first_, IteratorT2 const &last_, - token_sequence_type &pending, token_sequence_type &expanded, + token_type expand_tokensequence(IteratorT2 &first_, IteratorT2 const &last_, + token_sequence_type &pending, token_sequence_type &expanded, bool& seen_newline, bool expand_undefined = false) { - return macros.expand_tokensequence(first_, last_, pending, expanded, + return macros.expand_tokensequence(first_, last_, pending, expanded, seen_newline, expand_undefined); } template <typename IteratorT2> - void expand_whole_tokensequence(IteratorT2 &first_, IteratorT2 const &last_, + void expand_whole_tokensequence(IteratorT2 &first_, IteratorT2 const &last_, token_sequence_type &expanded, bool expand_undefined = true) { - macros.expand_whole_tokensequence(expanded, first_, last_, + macros.expand_whole_tokensequence(expanded, first_, last_, expand_undefined); // remove any contained placeholder @@ -401,33 +401,33 @@ public: // maintain the real name of the current preprocessed file void set_current_filename(char const *real_name) { current_filename = real_name; } - std::string const &get_current_filename() const + std::string const &get_current_filename() const { return current_filename; } -// maintain the list of known headers containing #pragma once +// maintain the list of known headers containing #pragma once bool has_pragma_once(std::string const &filename_) { return includes.has_pragma_once(filename_); } bool add_pragma_once_header(std::string const &filename_, std::string const& guard_name) - { + { get_hooks().detected_include_guard(derived(), filename_, guard_name); - return includes.add_pragma_once_header(filename_, guard_name); + return includes.add_pragma_once_header(filename_, guard_name); } - bool add_pragma_once_header(token_type const &pragma_, + bool add_pragma_once_header(token_type const &pragma_, std::string const &filename_) - { + { get_hooks().detected_pragma_once(derived(), pragma_, filename_); - return includes.add_pragma_once_header(filename_, - "__BOOST_WAVE_PRAGMA_ONCE__"); + return includes.add_pragma_once_header(filename_, + "__BOOST_WAVE_PRAGMA_ONCE__"); } -#endif +#endif void set_current_relative_filename(char const *real_name) { current_relative_filename = real_name; } - std::string const &get_current_relative_filename() const + std::string const &get_current_relative_filename() const { return current_relative_filename; } - bool find_include_file (std::string &s, std::string &d, bool is_system, + bool find_include_file (std::string &s, std::string &d, bool is_system, char const *current_file) const { return includes.find_include_file(s, d, is_system, current_file); } @@ -459,8 +459,8 @@ private: { using namespace boost::serialization; if (version != (loaded_version & ~version_mask)) { - BOOST_WAVE_THROW_CTX((*this), preprocess_exception, - incompatible_config, "cpp_context state version", + BOOST_WAVE_THROW_CTX((*this), preprocess_exception, + incompatible_config, "cpp_context state version", get_main_pos()); return; } @@ -471,7 +471,7 @@ private: // BOOST_PP_STRINGIZE(BOOST_WAVE_CONFIG) ar & make_nvp("config", config); if (config != BOOST_PP_STRINGIZE(BOOST_WAVE_CONFIG)) { - BOOST_WAVE_THROW_CTX((*this), preprocess_exception, + BOOST_WAVE_THROW_CTX((*this), preprocess_exception, incompatible_config, "BOOST_WAVE_CONFIG", get_main_pos()); return; } @@ -479,8 +479,8 @@ private: // BOOST_WAVE_PRAGMA_KEYWORD ar & make_nvp("pragma_keyword", pragma_keyword); if (pragma_keyword != BOOST_WAVE_PRAGMA_KEYWORD) { - BOOST_WAVE_THROW_CTX((*this), preprocess_exception, - incompatible_config, "BOOST_WAVE_PRAGMA_KEYWORD", + BOOST_WAVE_THROW_CTX((*this), preprocess_exception, + incompatible_config, "BOOST_WAVE_PRAGMA_KEYWORD", get_main_pos()); return; } @@ -488,7 +488,7 @@ private: // BOOST_PP_STRINGIZE((BOOST_WAVE_STRINGTYPE)) ar & make_nvp("string_type", string_type_str); if (string_type_str != BOOST_PP_STRINGIZE((BOOST_WAVE_STRINGTYPE))) { - BOOST_WAVE_THROW_CTX((*this), preprocess_exception, + BOOST_WAVE_THROW_CTX((*this), preprocess_exception, incompatible_config, "BOOST_WAVE_STRINGTYPE", get_main_pos()); return; } @@ -501,7 +501,7 @@ private: } catch (boost::wave::preprocess_exception const& e) { // catch version mismatch exceptions and call error handler - get_hooks().throw_exception(derived(), e); + get_hooks().throw_exception(derived(), e); } } BOOST_SERIALIZATION_SPLIT_MEMBER() @@ -515,7 +515,7 @@ private: bool has_been_initialized; // set cwd once #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0 std::string current_filename; // real name of current preprocessed file -#endif +#endif std::string current_relative_filename; // real relative name of current preprocessed file boost::wave::util::if_block_stack ifblocks; // conditional compilation contexts @@ -534,7 +534,7 @@ private: namespace boost { namespace serialization { template< - typename Iterator, typename LexIterator, + typename Iterator, typename LexIterator, typename InputPolicy, typename Hooks > struct tracking_level<boost::wave::context<Iterator, LexIterator, InputPolicy, Hooks> > @@ -548,7 +548,7 @@ struct tracking_level<boost::wave::context<Iterator, LexIterator, InputPolicy, H }; template< - typename Iterator, typename LexIterator, + typename Iterator, typename LexIterator, typename InputPolicy, typename Hooks > struct version<boost::wave::context<Iterator, LexIterator, InputPolicy, Hooks> > diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/util/cpp_iterator.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/util/cpp_iterator.hpp index b1bd8ee6..dc2d9342 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/util/cpp_iterator.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/util/cpp_iterator.hpp @@ -20,7 +20,7 @@ #include <cctype> #include <boost/assert.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/filesystem/path.hpp> #include <boost/filesystem/operations.hpp> #include <boost/spirit/include/classic_multi_pass.hpp> @@ -359,7 +359,7 @@ protected: private: ContextT &ctx; // context, this iterator is associated with - boost::std::shared_ptr<base_iteration_context_type> iter_ctx; + boost::shared_ptr<base_iteration_context_type> iter_ctx; bool seen_newline; // needed for recognizing begin of line bool skipped_newline; // a newline has been skipped since last one @@ -1608,7 +1608,7 @@ char const *current_name = 0; // never try to match current file name ctx.set_current_directory(native_path_str.c_str()); // preprocess the opened file - boost::std::shared_ptr<base_iteration_context_type> new_iter_ctx ( + boost::shared_ptr<base_iteration_context_type> new_iter_ctx ( new iteration_context_type(ctx, native_path_str.c_str(), act_pos, boost::wave::enable_prefer_pp_numbers(ctx.get_language()), is_system ? base_iteration_context_type::system_header : diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/util/cpp_macromap.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/util/cpp_macromap.hpp index 9ccefca1..fb251ea1 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/util/cpp_macromap.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/util/cpp_macromap.hpp @@ -28,7 +28,7 @@ #include <boost/wave/wave_config.hpp> #if BOOST_WAVE_SERIALIZATION != 0 #include <boost/serialization/serialization.hpp> -#include <boost/serialization/std::shared_ptr.hpp> +#include <boost/serialization/shared_ptr.hpp> #endif #include <boost/filesystem/path.hpp> @@ -259,7 +259,7 @@ private: private: defined_macros_type *current_macros; // current symbol table - boost::std::shared_ptr<defined_macros_type> defined_macros; // global symbol table + boost::shared_ptr<defined_macros_type> defined_macros; // global symbol table token_type act_token; // current token position_type main_pos; // last token position in the pp_iterator diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/util/symbol_table.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/util/symbol_table.hpp index f622d45c..312b0a2f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/util/symbol_table.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/wave/util/symbol_table.hpp @@ -14,14 +14,14 @@ #include <map> #include <boost/wave/wave_config.hpp> -#include <boost/intrusive_ptr.hpp> +#include <boost/intrusive_ptr.hpp> #if BOOST_WAVE_SERIALIZATION != 0 #include <boost/serialization/serialization.hpp> #include <boost/serialization/map.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #else -#include <boost/intrusive_ptr.hpp> +#include <boost/intrusive_ptr.hpp> #endif #include <boost/iterator/transform_iterator.hpp> @@ -38,27 +38,27 @@ namespace util { /////////////////////////////////////////////////////////////////////////////// // -// The symbol_table class is used for the storage of defined macros. +// The symbol_table class is used for the storage of defined macros. // /////////////////////////////////////////////////////////////////////////////// template <typename StringT, typename MacroDefT> -struct symbol_table +struct symbol_table #if BOOST_WAVE_SERIALIZATION != 0 -: public std::map<StringT, boost::std::shared_ptr<MacroDefT> > +: public std::map<StringT, boost::shared_ptr<MacroDefT> > #else -: public std::map<StringT, boost::intrusive_ptr<MacroDefT> > +: public std::map<StringT, boost::intrusive_ptr<MacroDefT> > #endif { #if BOOST_WAVE_SERIALIZATION != 0 - typedef std::map<StringT, boost::std::shared_ptr<MacroDefT> > base_type; + typedef std::map<StringT, boost::shared_ptr<MacroDefT> > base_type; #else typedef std::map<StringT, boost::intrusive_ptr<MacroDefT> > base_type; #endif typedef typename base_type::iterator iterator_type; typedef typename base_type::const_iterator const_iterator_type; - symbol_table(long uid_ = 0) + symbol_table(long uid_ = 0) {} #if BOOST_WAVE_SERIALIZATION != 0 @@ -68,7 +68,7 @@ private: void serialize(Archive &ar, const unsigned int version) { using namespace boost::serialization; - ar & make_nvp("symbol_table", + ar & make_nvp("symbol_table", boost::serialization::base_object<base_type>(*this)); } #endif @@ -76,7 +76,7 @@ private: private: /////////////////////////////////////////////////////////////////////////// // - // This is a special iterator allowing to iterate the names of all defined + // This is a special iterator allowing to iterate the names of all defined // macros. // /////////////////////////////////////////////////////////////////////////// @@ -94,13 +94,13 @@ private: typedef get_first<StringT> unary_functor; public: - typedef transform_iterator<unary_functor, iterator_type> + typedef transform_iterator<unary_functor, iterator_type> name_iterator; - typedef transform_iterator<unary_functor, const_iterator_type> + typedef transform_iterator<unary_functor, const_iterator_type> const_name_iterator; template <typename Iterator> - static + static transform_iterator<unary_functor, Iterator> make_iterator(Iterator it) { return boost::make_transform_iterator<unary_functor>(it); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/access.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/access.hpp index a1fe00f2..d984a432 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/access.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/access.hpp @@ -14,7 +14,7 @@ #endif #include <vector> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/proto/traits.hpp> #include <boost/xpressive/detail/detail_fwd.hpp> #include <boost/xpressive/detail/dynamic/matchable.hpp> @@ -41,7 +41,7 @@ struct core_access return rex.match_(state); } - static std::shared_ptr<detail::regex_impl<BidiIter> > const & + static shared_ptr<detail::regex_impl<BidiIter> > const & get_regex_impl(basic_regex<BidiIter> const &rex) { return proto::value(rex).get(); diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/linker.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/linker.hpp index 15c2d951..e87e26d1 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/linker.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/linker.hpp @@ -20,7 +20,7 @@ #include <stack> #include <limits> #include <typeinfo> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/type_traits/is_same.hpp> #include <boost/version.hpp> diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/matcher/regex_byref_matcher.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/matcher/regex_byref_matcher.hpp index bb036635..f9282042 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/matcher/regex_byref_matcher.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/matcher/regex_byref_matcher.hpp @@ -15,7 +15,7 @@ #include <boost/assert.hpp> #include <boost/mpl/assert.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/xpressive/regex_error.hpp> #include <boost/xpressive/regex_constants.hpp> #include <boost/xpressive/detail/detail_fwd.hpp> @@ -41,7 +41,7 @@ namespace boost { namespace xpressive { namespace detail // we don't have to worry about it going away. regex_impl<BidiIter> const *pimpl_; - regex_byref_matcher(std::shared_ptr<regex_impl<BidiIter> > const &impl) + regex_byref_matcher(shared_ptr<regex_impl<BidiIter> > const &impl) : wimpl_(impl) , pimpl_(impl.get()) { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/matcher/regex_matcher.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/matcher/regex_matcher.hpp index 100317df..e7eee7d3 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/matcher/regex_matcher.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/core/matcher/regex_matcher.hpp @@ -34,7 +34,7 @@ namespace boost { namespace xpressive { namespace detail { regex_impl<BidiIter> impl_; - regex_matcher(std::shared_ptr<regex_impl<BidiIter> > const &impl) + regex_matcher(shared_ptr<regex_impl<BidiIter> > const &impl) : impl_() { this->impl_.xpr_ = impl->xpr_; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/detail_fwd.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/detail_fwd.hpp index 7fd3088b..52deaae9 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/detail_fwd.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/detail_fwd.hpp @@ -20,7 +20,7 @@ #include <typeinfo> #include <boost/mpl/bool.hpp> #include <boost/mpl/size_t.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/xpressive/xpressive_fwd.hpp> namespace boost { namespace xpressive { namespace detail @@ -353,7 +353,7 @@ namespace boost { namespace xpressive { namespace detail int get_mark_number(basic_mark_tag const &); template<typename Xpr, typename BidiIter> - void static_compile(Xpr const &xpr, std::shared_ptr<regex_impl<BidiIter> > const &impl); + void static_compile(Xpr const &xpr, shared_ptr<regex_impl<BidiIter> > const &impl); struct quant_spec; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/static/compile.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/static/compile.hpp index 023a238a..bc8af05b 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/static/compile.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/static/compile.hpp @@ -32,7 +32,7 @@ namespace boost { namespace xpressive { namespace detail /////////////////////////////////////////////////////////////////////////////// // static_compile_impl2 template<typename Xpr, typename BidiIter, typename Traits> - void static_compile_impl2(Xpr const &xpr, std::shared_ptr<regex_impl<BidiIter> > const &impl, Traits const &tr) + void static_compile_impl2(Xpr const &xpr, shared_ptr<regex_impl<BidiIter> > const &impl, Traits const &tr) { typedef typename iterator_value<BidiIter>::type char_type; impl->tracking_clear(); @@ -70,7 +70,7 @@ namespace boost { namespace xpressive { namespace detail // static_compile_impl1 template<typename Xpr, typename BidiIter> typename disable_if<proto::matches<Xpr, XpressiveLocaleModifier> >::type - static_compile_impl1(Xpr const &xpr, std::shared_ptr<regex_impl<BidiIter> > const &impl) + static_compile_impl1(Xpr const &xpr, shared_ptr<regex_impl<BidiIter> > const &impl) { // use default traits typedef typename iterator_value<BidiIter>::type char_type; @@ -83,7 +83,7 @@ namespace boost { namespace xpressive { namespace detail // static_compile_impl1 template<typename Xpr, typename BidiIter> typename enable_if<proto::matches<Xpr, XpressiveLocaleModifier> >::type - static_compile_impl1(Xpr const &xpr, std::shared_ptr<regex_impl<BidiIter> > const &impl) + static_compile_impl1(Xpr const &xpr, shared_ptr<regex_impl<BidiIter> > const &impl) { // use specified traits typedef typename proto::result_of::value<typename proto::result_of::left<Xpr>::type>::type::locale_type locale_type; @@ -94,7 +94,7 @@ namespace boost { namespace xpressive { namespace detail /////////////////////////////////////////////////////////////////////////////// // static_compile template<typename Xpr, typename BidiIter> - void static_compile(Xpr const &xpr, std::shared_ptr<regex_impl<BidiIter> > const &impl) + void static_compile(Xpr const &xpr, shared_ptr<regex_impl<BidiIter> > const &impl) { static_compile_impl1(xpr, impl); } diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/static/placeholders.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/static/placeholders.hpp index 75c09b4a..5c955384 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/static/placeholders.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/static/placeholders.hpp @@ -17,7 +17,7 @@ #endif #include <string> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/xpressive/detail/core/quant_style.hpp> #include <boost/xpressive/detail/core/regex_impl.hpp> diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/static/visitor.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/static/visitor.hpp index 68ac32f1..5a0213f6 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/static/visitor.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/static/visitor.hpp @@ -14,7 +14,7 @@ #endif #include <boost/ref.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/xpressive/detail/detail_fwd.hpp> #include <boost/xpressive/detail/core/regex_impl.hpp> #include <boost/xpressive/detail/static/transmogrify.hpp> @@ -27,7 +27,7 @@ namespace boost { namespace xpressive { namespace detail template<typename BidiIter> struct xpression_visitor_base { - explicit xpression_visitor_base(std::shared_ptr<regex_impl<BidiIter> > const &self) + explicit xpression_visitor_base(shared_ptr<regex_impl<BidiIter> > const &self) : self_(self) { } @@ -51,7 +51,7 @@ namespace boost { namespace xpressive { namespace detail } } - std::shared_ptr<regex_impl<BidiIter> > &self() + shared_ptr<regex_impl<BidiIter> > &self() { return this->self_; } @@ -94,7 +94,7 @@ namespace boost { namespace xpressive { namespace detail } private: - std::shared_ptr<regex_impl<BidiIter> > self_; + shared_ptr<regex_impl<BidiIter> > self_; }; /////////////////////////////////////////////////////////////////////////////// @@ -108,7 +108,7 @@ namespace boost { namespace xpressive { namespace detail typedef Traits traits_type; typedef typename boost::iterator_value<BidiIter>::type char_type; - explicit xpression_visitor(Traits const &tr, std::shared_ptr<regex_impl<BidiIter> > const &self) + explicit xpression_visitor(Traits const &tr, shared_ptr<regex_impl<BidiIter> > const &self) : xpression_visitor_base<BidiIter>(self) , traits_(tr) { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/utility/symbols.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/utility/symbols.hpp index ffb9b552..5efa4aba 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/utility/symbols.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/utility/symbols.hpp @@ -26,7 +26,7 @@ #include <boost/range/end.hpp> #include <boost/range/value_type.hpp> #include <boost/range/const_iterator.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> namespace boost { namespace xpressive { namespace detail { @@ -75,9 +75,9 @@ namespace boost { namespace xpressive { namespace detail private: /////////////////////////////////////////////////////////////////////////////// - // struct node : a node in the TST. + // struct node : a node in the TST. // The "eq" field stores the result pointer when ch is zero. - // + // struct node : boost::noncopyable { @@ -125,7 +125,7 @@ namespace boost { namespace xpressive { namespace detail /////////////////////////////////////////////////////////////////////////////// // insert : insert a string into the TST - // + // template<typename Trans> node* insert(node* p, key_iterator &begin, key_iterator end, result_type r, Trans trans) const { @@ -168,7 +168,7 @@ namespace boost { namespace xpressive { namespace detail /////////////////////////////////////////////////////////////////////////////// // conditional rotation : the goal is to minimize the overall // weighted path length of each binary search tree - // + // bool cond_rotation(bool left, node* const i, node* const j) const { // don't rotate top node in binary search tree @@ -201,7 +201,7 @@ namespace boost { namespace xpressive { namespace detail /////////////////////////////////////////////////////////////////////////////// // search : find a string in the TST - // + // template<typename BidiIter, typename Trans> result_type search(BidiIter &begin, BidiIter end, Trans trans, node* p) const { @@ -276,7 +276,7 @@ namespace boost { namespace xpressive { namespace detail } } - boost::std::shared_ptr<node> root; + boost::shared_ptr<node> root; }; }}} // namespace boost::xpressive::detail diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/utility/tracking_ptr.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/utility/tracking_ptr.hpp index 0c211c3c..c6a0353e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/utility/tracking_ptr.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/detail/utility/tracking_ptr.hpp @@ -21,7 +21,7 @@ #include <boost/config.hpp> #include <boost/assert.hpp> #include <boost/weak_ptr.hpp> -#include <boost/std::shared_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/mpl/assert.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/detail/workaround.hpp> @@ -48,7 +48,7 @@ struct weak_iterator : iterator_facade < weak_iterator<Derived> - , std::shared_ptr<Derived> const + , shared_ptr<Derived> const , std::forward_iterator_tag > { @@ -73,7 +73,7 @@ struct weak_iterator private: friend class boost::iterator_core_access; - std::shared_ptr<Derived> const &dereference() const + shared_ptr<Derived> const &dereference() const { return this->cur_; } @@ -102,7 +102,7 @@ private: this->cur_.reset(); } - std::shared_ptr<Derived> cur_; + shared_ptr<Derived> cur_; base_iterator iter_; set_type *set_; }; @@ -112,14 +112,14 @@ private: // for use with a filter_iterator to filter a node out of a list of dependencies template<typename Derived> struct filter_self - : std::unary_function<std::shared_ptr<Derived>, bool> + : std::unary_function<shared_ptr<Derived>, bool> { filter_self(enable_reference_tracking<Derived> *self) : self_(self) { } - bool operator ()(std::shared_ptr<Derived> const &that) const + bool operator ()(shared_ptr<Derived> const &that) const { return this->self_ != that.get(); } @@ -144,7 +144,7 @@ void adl_swap(T &t1, T &t2) template<typename Derived> struct enable_reference_tracking { - typedef std::set<std::shared_ptr<Derived> > references_type; + typedef std::set<shared_ptr<Derived> > references_type; typedef std::set<weak_ptr<Derived> > dependents_type; void tracking_copy(Derived const &that) @@ -321,7 +321,7 @@ private: references_type refs_; dependents_type deps_; - std::shared_ptr<Derived> self_; + shared_ptr<Derived> self_; boost::detail::atomic_count cnt_; }; @@ -345,7 +345,7 @@ inline void intrusive_ptr_release(enable_reference_tracking<Derived> *p) template<typename Derived> inline void enable_reference_tracking<Derived>::dump_(std::ostream &sout) const { - std::shared_ptr<Derived> this_ = this->self_; + shared_ptr<Derived> this_ = this->self_; sout << "0x" << (void*)this << " cnt=" << this_.use_count()-1 << " refs={"; typename references_type::const_iterator cur1 = this->refs_.begin(); typename references_type::const_iterator end1 = this->refs_.end(); @@ -358,8 +358,8 @@ inline void enable_reference_tracking<Derived>::dump_(std::ostream &sout) const typename dependents_type::const_iterator end2 = this->deps_.end(); for(; cur2 != end2; ++cur2) { - // ericne, 27/nov/05: CW9_4 doesn't like if(std::shared_ptr x = y) - std::shared_ptr<Derived> dep = cur2->lock(); + // ericne, 27/nov/05: CW9_4 doesn't like if(shared_ptr x = y) + shared_ptr<Derived> dep = cur2->lock(); if(dep.get()) { sout << "0x" << (void*)&*dep << ','; @@ -425,7 +425,7 @@ struct tracking_ptr } // calling this forces this->impl_ to fork. - std::shared_ptr<element_type> const &get() const + shared_ptr<element_type> const &get() const { if(intrusive_ptr<element_type> impl = this->fork_()) { @@ -480,7 +480,7 @@ private: { impl = this->impl_; BOOST_ASSERT(!this->has_deps_()); - std::shared_ptr<element_type> simpl(new element_type); + shared_ptr<element_type> simpl(new element_type); this->impl_ = get_pointer(simpl->self_ = simpl); } return impl; diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/regex_compiler.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/regex_compiler.hpp index ca47501e..4a2a9d74 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/regex_compiler.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/xpressive/regex_compiler.hpp @@ -375,7 +375,7 @@ private: , "mismatched parenthesis" ); basic_regex<BidiIter> &rex = this->rules_[name]; - std::shared_ptr<detail::regex_impl<BidiIter> > impl = access::get_regex_impl(rex); + shared_ptr<detail::regex_impl<BidiIter> > impl = access::get_regex_impl(rex); this->self_->track_reference(*impl); return detail::make_dynamic<BidiIter>(detail::regex_byref_matcher<BidiIter>(impl)); } @@ -735,7 +735,7 @@ private: std::size_t hidden_mark_count_; CompilerTraits traits_; typename RegexTraits::char_class_type upper_; - std::shared_ptr<detail::regex_impl<BidiIter> > self_; + shared_ptr<detail::regex_impl<BidiIter> > self_; std::map<string_type, basic_regex<BidiIter> > rules_; }; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp index a5e97a2f..1cb5e2ee 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp @@ -3,7 +3,7 @@ #ifndef SN_TARGET_PS3_SPU // #include "..\..\..\stdafx.h" #endif -#endif +#endif #include "ChunkRebuildData.h" #include "Tesselator_SPU.h" @@ -13,7 +13,7 @@ #include "..\..\..\..\Minecraft.World\Tile.h" #include "..\..\..\..\Minecraft.World\Level.h" #include "..\..\..\..\Minecraft.World\Dimension.h" -// +// // #include "..\..\..\Chunk.h" // #include "..\..\..\TileRenderer.h" // #include "..\..\..\TileEntityRenderDispatcher.h" @@ -26,13 +26,13 @@ #include "..\..\..\..\Minecraft.World\BiomeSource.h" #else - + #include "..\Common\spu_assert.h" #endif //SN_TARGET_PS3_SPU static const int Level_maxBuildHeight = 256; -static const int Level_MAX_LEVEL_SIZE = 30000000; +static const int Level_MAX_LEVEL_SIZE = 30000000; static const int Level_MAX_BRIGHTNESS = 15; @@ -53,7 +53,7 @@ int ChunkRebuildData::getGrassColor( int x, int z ) { return m_grassColor[get int ChunkRebuildData::getFoliageColor( int x, int z ) { return m_foliageColor[getTileIdx(x,z)]; } int ChunkRebuildData::getFlags(int x, int y, int z) { return m_data_flags[getTileIdx(x,y,z)] >> 4; } void ChunkRebuildData::setFlag(int x, int y, int z, int flag) { m_data_flags[getTileIdx(x,y,z)] |= (flag<<4);} -#endif +#endif @@ -77,7 +77,7 @@ void ChunkRebuildData::disableUnseenTiles() int tileID = getTile(iX,iY,iZ); if( tileID == 0 ) continue; m_flags &= ~e_flag_EmptyChunk; - + // Don't bother trying to work out neighbours for this tile if we are at the edge of the chunk - apart from the very // bottom of the world where we shouldn't ever be able to see @@ -120,7 +120,7 @@ void ChunkRebuildData::disableUnseenTiles() } } } - + #ifndef SN_TARGET_PS3_SPU void setIconSPUFromIcon(Icon_SPU* iconSpu, Icon* icon) @@ -145,78 +145,78 @@ void ChunkRebuildData::buildMaterial(int matSPUIndex, Material* mat) void ChunkRebuildData::buildMaterials() { - buildMaterial(Material_SPU::air_Id, Material::air); - buildMaterial(Material_SPU::grass_Id, Material::grass); - buildMaterial(Material_SPU::dirt_Id, Material::dirt); - buildMaterial(Material_SPU::wood_Id, Material::wood); - buildMaterial(Material_SPU::stone_Id, Material::stone); - buildMaterial(Material_SPU::metal_Id, Material::metal); - buildMaterial(Material_SPU::water_Id, Material::water); - buildMaterial(Material_SPU::lava_Id, Material::lava); - buildMaterial(Material_SPU::leaves_Id, Material::leaves); - buildMaterial(Material_SPU::plant_Id, Material::plant); - buildMaterial(Material_SPU::replaceable_plant_Id, Material::replaceable_plant); - buildMaterial(Material_SPU::sponge_Id, Material::sponge); - buildMaterial(Material_SPU::cloth_Id, Material::cloth); - buildMaterial(Material_SPU::fire_Id, Material::fire); - buildMaterial(Material_SPU::sand_Id, Material::sand); - buildMaterial(Material_SPU::decoration_Id, Material::decoration); - buildMaterial(Material_SPU::clothDecoration_Id, Material::clothDecoration); - buildMaterial(Material_SPU::glass_Id, Material::glass); - buildMaterial(Material_SPU::explosive_Id, Material::explosive); - buildMaterial(Material_SPU::coral_Id, Material::coral); - buildMaterial(Material_SPU::ice_Id, Material::ice); - buildMaterial(Material_SPU::topSnow_Id, Material::topSnow); - buildMaterial(Material_SPU::snow_Id, Material::snow); - buildMaterial(Material_SPU::cactus_Id, Material::cactus); - buildMaterial(Material_SPU::clay_Id, Material::clay); - buildMaterial(Material_SPU::vegetable_Id, Material::vegetable); - buildMaterial(Material_SPU::egg_Id, Material::egg); - buildMaterial(Material_SPU::portal_Id, Material::portal); - buildMaterial(Material_SPU::cake_Id, Material::cake); - buildMaterial(Material_SPU::web_Id, Material::web); - buildMaterial(Material_SPU::piston_Id, Material::piston); - buildMaterial(Material_SPU::buildable_glass_Id, Material::buildable_glass); - buildMaterial(Material_SPU::heavyMetal_Id, Material::heavyMetal); + buildMaterial(Material_SPU::air_Id, Material::air); + buildMaterial(Material_SPU::grass_Id, Material::grass); + buildMaterial(Material_SPU::dirt_Id, Material::dirt); + buildMaterial(Material_SPU::wood_Id, Material::wood); + buildMaterial(Material_SPU::stone_Id, Material::stone); + buildMaterial(Material_SPU::metal_Id, Material::metal); + buildMaterial(Material_SPU::water_Id, Material::water); + buildMaterial(Material_SPU::lava_Id, Material::lava); + buildMaterial(Material_SPU::leaves_Id, Material::leaves); + buildMaterial(Material_SPU::plant_Id, Material::plant); + buildMaterial(Material_SPU::replaceable_plant_Id, Material::replaceable_plant); + buildMaterial(Material_SPU::sponge_Id, Material::sponge); + buildMaterial(Material_SPU::cloth_Id, Material::cloth); + buildMaterial(Material_SPU::fire_Id, Material::fire); + buildMaterial(Material_SPU::sand_Id, Material::sand); + buildMaterial(Material_SPU::decoration_Id, Material::decoration); + buildMaterial(Material_SPU::clothDecoration_Id, Material::clothDecoration); + buildMaterial(Material_SPU::glass_Id, Material::glass); + buildMaterial(Material_SPU::explosive_Id, Material::explosive); + buildMaterial(Material_SPU::coral_Id, Material::coral); + buildMaterial(Material_SPU::ice_Id, Material::ice); + buildMaterial(Material_SPU::topSnow_Id, Material::topSnow); + buildMaterial(Material_SPU::snow_Id, Material::snow); + buildMaterial(Material_SPU::cactus_Id, Material::cactus); + buildMaterial(Material_SPU::clay_Id, Material::clay); + buildMaterial(Material_SPU::vegetable_Id, Material::vegetable); + buildMaterial(Material_SPU::egg_Id, Material::egg); + buildMaterial(Material_SPU::portal_Id, Material::portal); + buildMaterial(Material_SPU::cake_Id, Material::cake); + buildMaterial(Material_SPU::web_Id, Material::web); + buildMaterial(Material_SPU::piston_Id, Material::piston); + buildMaterial(Material_SPU::buildable_glass_Id, Material::buildable_glass); + buildMaterial(Material_SPU::heavyMetal_Id, Material::heavyMetal); } int ChunkRebuildData::getMaterialID(Tile* pTile) { Material* m = pTile->material; - if(m == Material::air) return Material_SPU::air_Id; - if(m == Material::grass) return Material_SPU::grass_Id; - if(m == Material::dirt) return Material_SPU::dirt_Id; - if(m == Material::wood) return Material_SPU::wood_Id; - if(m == Material::stone) return Material_SPU::stone_Id; - if(m == Material::metal) return Material_SPU::metal_Id; - if(m == Material::water) return Material_SPU::water_Id; - if(m == Material::lava) return Material_SPU::lava_Id; - if(m == Material::leaves) return Material_SPU::leaves_Id; - if(m == Material::plant) return Material_SPU::plant_Id; - if(m == Material::replaceable_plant)return Material_SPU::replaceable_plant_Id; - if(m == Material::sponge) return Material_SPU::sponge_Id; - if(m == Material::cloth) return Material_SPU::cloth_Id; - if(m == Material::fire) return Material_SPU::fire_Id; - if(m == Material::sand) return Material_SPU::sand_Id; - if(m == Material::decoration) return Material_SPU::decoration_Id; - if(m == Material::clothDecoration) return Material_SPU::clothDecoration_Id; + if(m == Material::air) return Material_SPU::air_Id; + if(m == Material::grass) return Material_SPU::grass_Id; + if(m == Material::dirt) return Material_SPU::dirt_Id; + if(m == Material::wood) return Material_SPU::wood_Id; + if(m == Material::stone) return Material_SPU::stone_Id; + if(m == Material::metal) return Material_SPU::metal_Id; + if(m == Material::water) return Material_SPU::water_Id; + if(m == Material::lava) return Material_SPU::lava_Id; + if(m == Material::leaves) return Material_SPU::leaves_Id; + if(m == Material::plant) return Material_SPU::plant_Id; + if(m == Material::replaceable_plant)return Material_SPU::replaceable_plant_Id; + if(m == Material::sponge) return Material_SPU::sponge_Id; + if(m == Material::cloth) return Material_SPU::cloth_Id; + if(m == Material::fire) return Material_SPU::fire_Id; + if(m == Material::sand) return Material_SPU::sand_Id; + if(m == Material::decoration) return Material_SPU::decoration_Id; + if(m == Material::clothDecoration) return Material_SPU::clothDecoration_Id; if(m == Material::glass) return Material_SPU::glass_Id; - if(m == Material::explosive) return Material_SPU::explosive_Id; - if(m == Material::coral) return Material_SPU::coral_Id; - if(m == Material::ice) return Material_SPU::ice_Id; - if(m == Material::topSnow) return Material_SPU::topSnow_Id; - if(m == Material::snow) return Material_SPU::snow_Id; - if(m == Material::cactus) return Material_SPU::cactus_Id; - if(m == Material::clay) return Material_SPU::clay_Id; - if(m == Material::vegetable) return Material_SPU::vegetable_Id; - if(m == Material::egg) return Material_SPU::egg_Id; - if(m == Material::portal) return Material_SPU::portal_Id; - if(m == Material::cake) return Material_SPU::cake_Id; - if(m == Material::web) return Material_SPU::web_Id; - if(m == Material::piston) return Material_SPU::piston_Id; + if(m == Material::explosive) return Material_SPU::explosive_Id; + if(m == Material::coral) return Material_SPU::coral_Id; + if(m == Material::ice) return Material_SPU::ice_Id; + if(m == Material::topSnow) return Material_SPU::topSnow_Id; + if(m == Material::snow) return Material_SPU::snow_Id; + if(m == Material::cactus) return Material_SPU::cactus_Id; + if(m == Material::clay) return Material_SPU::clay_Id; + if(m == Material::vegetable) return Material_SPU::vegetable_Id; + if(m == Material::egg) return Material_SPU::egg_Id; + if(m == Material::portal) return Material_SPU::portal_Id; + if(m == Material::cake) return Material_SPU::cake_Id; + if(m == Material::web) return Material_SPU::web_Id; + if(m == Material::piston) return Material_SPU::piston_Id; if(m == Material::buildable_glass) return Material_SPU::buildable_glass_Id; if(m == Material::heavyMetal) return Material_SPU::heavyMetal_Id; - assert(0); + assert(0); return Material_SPU::air_Id; } @@ -364,12 +364,12 @@ void ChunkRebuildData::createTileData() // recordPlayer setIconSPUFromIcon(&m_tileData.recordPlayer_iconTop, ((RecordPlayerTile*)Tile::recordPlayer)->iconTop); - // pumpkin + // pumpkin setIconSPUFromIcon(&m_tileData.pumpkinTile_iconTop, ((PumpkinTile*)Tile::pumpkin)->iconTop); setIconSPUFromIcon(&m_tileData.pumpkinTile_iconFace, ((PumpkinTile*)Tile::pumpkin)->iconFace); setIconSPUFromIcon(&m_tileData.pumpkinTile_iconFaceLit, ((PumpkinTile*)Tile::litPumpkin)->iconFace); - // cakeTile + // cakeTile setIconSPUFromIcon(&m_tileData.cakeTile_iconTop, ((CakeTile*)Tile::cake)->iconTop); setIconSPUFromIcon(&m_tileData.cakeTile_iconBottom, ((CakeTile*)Tile::cake)->iconBottom); setIconSPUFromIcon(&m_tileData.cakeTile_iconInner, ((CakeTile*)Tile::cake)->iconInner); @@ -509,7 +509,7 @@ void ChunkRebuildData::buildForChunk( Region* region, Level* level, int x0, int // assert(index < 400); int cacheBlockIndex = (cacheMap[iZ-m_z0]*3) + cacheMap[iX-m_x0]; BiomeCache::Block* pCacheBlock = cacheBlocks[cacheBlockIndex]; -// assert(region->getBiomeSource()->getBlockAt(iX, iZ) == pCacheBlock); +// assert(region->getBiomeSource()->getBlockAt(iX, iZ) == pCacheBlock); Biome* pBiome = pCacheBlock->getBiome(iX, iZ); m_grassColor[index] = pColourTable->getColor(pBiome->m_grassColor); m_foliageColor[index] = pColourTable->getColor(pBiome->m_foliageColor); @@ -537,7 +537,7 @@ void ChunkRebuildData::copyFromTesselator() m_tesselator.m_PPUOffset = 0; // copy tesselator vars over - m_tesselator.vertices = t->vertices; + m_tesselator.vertices = t->vertices; m_tesselator.u = t->u; m_tesselator.v = t->v; m_tesselator._tex2 = t->_tex2; @@ -588,7 +588,7 @@ void ChunkRebuildData::storeInTesselator() Tesselator* t = Tesselator::getInstance(); // 4J - added - static initialiser being set at the wrong time // copy tesselator vars over - t->vertices = m_tesselator.vertices; + t->vertices = m_tesselator.vertices; t->u = m_tesselator.u; t->v = m_tesselator.v; t->_tex2 = m_tesselator._tex2; @@ -647,7 +647,7 @@ void ChunkRebuildData::tesselateAllTiles(TileRenderer_SPU* pTileRenderer) { // if (m_currentLayer == 0 && m_tileData.isEntityTile[tileId]) // { -// std::shared_ptr<TileEntity> et = region->getTileEntity(x, y, z); +// shared_ptr<TileEntity> et = region->getTileEntity(x, y, z); // if (TileEntityRenderDispatcher::instance->hasRenderer(et)) // { // renderableTileEntities.push_back(et); @@ -801,7 +801,7 @@ int ChunkRebuildData::getBrightnessPropagate(LightLayer::variety layer, int x, i if(layer == LightLayer::Sky) return getBrightnessSky(x, y, z); return getBrightnessBlock(x, y, z); - + } int ChunkRebuildData::getLightColor(int x, int y, int z, int emitt) // 4J - change brought forward from 1.8.2 { @@ -865,7 +865,7 @@ int ChunkRebuildData::getRawBrightness(int x, int y, int z, bool propagate) int ChunkRebuildData::LevelChunk_getRawBrightness(int x, int y, int z, int skyDampen) { int light = (m_flags & e_flag_HasCeiling) ? 0 : getBrightnessSky(x, y, z); - if (light > 0) + if (light > 0) m_flags |= e_flag_TouchedSky; light -= skyDampen; int block = getBrightnessBlock(x, y, z); diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LeverTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LeverTile_SPU.h index 53c9f3ec..06dda5bb 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LeverTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LeverTile_SPU.h @@ -8,5 +8,5 @@ public: virtual bool blocksLight() { return false; } virtual bool isSolidRender(bool isServerLevel = false) { return false; } virtual int getRenderShape() { return Tile_SPU::SHAPE_LEVER; } -// virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, std::shared_ptr<TileEntity> forceEntity = std::shared_ptr<TileEntity>()); // 4J added forceData, forceEntity param +// virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>()); // 4J added forceData, forceEntity param }; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PistonBaseTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PistonBaseTile_SPU.h index a8c6851c..e8411c88 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PistonBaseTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PistonBaseTile_SPU.h @@ -12,7 +12,7 @@ public: virtual int getRenderShape() { return SHAPE_PISTON_BASE; } virtual bool isSolidRender(bool isServerLevel = false) { return false; } - // virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, std::shared_ptr<TileEntity> forceEntity = std::shared_ptr<TileEntity>()); // 4J added forceData, forceEntity param + // virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>()); // 4J added forceData, forceEntity param // virtual void updateDefaultShape(); };
\ No newline at end of file diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PistonExtensionTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PistonExtensionTile_SPU.h index 3323cfd0..d5460492 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PistonExtensionTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PistonExtensionTile_SPU.h @@ -9,5 +9,5 @@ public: virtual Icon_SPU *getTexture(int face, int data) { return NULL; } virtual int getRenderShape() { return SHAPE_PISTON_EXTENSION; } virtual bool isSolidRender(bool isServerLevel = false) { return false; } -// virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, std::shared_ptr<TileEntity> forceEntity = std::shared_ptr<TileEntity>()); // 4J added forceData, forceEntity param +// virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>()); // 4J added forceData, forceEntity param };
\ No newline at end of file diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TheEndPortal_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TheEndPortal_SPU.h index b8bed9a8..f6e3b3e7 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TheEndPortal_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TheEndPortal_SPU.h @@ -6,7 +6,7 @@ class TheEndPortal_SPU : public EntityTile_SPU public: TheEndPortal_SPU(int id) : EntityTile_SPU(id) {} -// virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, std::shared_ptr<TileEntity> forceEntity = std::shared_ptr<TileEntity>()); // 4J added forceData, forceEntity param +// virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>()); // 4J added forceData, forceEntity param virtual bool shouldRenderFace(ChunkRebuildData *level, int x, int y, int z, int face) { if (face != 0) return false; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp index 552345fd..f2dfeaac 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp @@ -118,14 +118,14 @@ float Tile_SPU::getBrightness(ChunkRebuildData *level, int x, int y, int z) { return level->getBrightness(x, y, z, ms_pTileData->lightEmission[id]); } -// +// // // 4J - brought forward from 1.8.2 int Tile_SPU::getLightColor(ChunkRebuildData *level, int x, int y, int z) { int tileID = level->getTile(x, y, z); return level->getLightColor(x, y, z, ms_pTileData->lightEmission[tileID]); } -// +// // bool Tile_SPU::isFaceVisible(Level *level, int x, int y, int z, int f) // { // if (f == 0) y--; @@ -136,7 +136,7 @@ int Tile_SPU::getLightColor(ChunkRebuildData *level, int x, int y, int z) // if (f == 5) x++; // return !level->isSolidRenderTile(x, y, z); // } -// +// bool Tile_SPU::shouldRenderFace(ChunkRebuildData *level, int x, int y, int z, int face) { if (face == 0 && getShapeY0() > 0) return true; @@ -147,7 +147,7 @@ bool Tile_SPU::shouldRenderFace(ChunkRebuildData *level, int x, int y, int z, in if (face == 5 && getShapeX1() < 1) return true; return (!level->isSolidRenderTile(x, y, z)); } -// +// bool Tile_SPU::isSolidFace(ChunkRebuildData *level, int x, int y, int z, int face) { return (level->getMaterial(x, y, z)->isSolid()); @@ -196,39 +196,39 @@ Icon_SPU *Tile_SPU::getTexture(ChunkRebuildData *level, int x, int y, int z, int } return getTexture(face, tileData); } -// +// Icon_SPU *Tile_SPU::getTexture(int face, int data) { return &ms_pTileData->iconData[id]; } -// +// Icon_SPU *Tile_SPU::getTexture(int face) { return getTexture(face, 0); } -// +// // AABB *Tile_SPU::getTileAABB(Level *level, int x, int y, int z) // { // return AABB::newTemp(x + xx0, y + yy0, z + zz0, x + xx1, y + yy1, z + zz1); // } -// -// void Tile_SPU::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList *boxes, Entity *source) +// +// void Tile_SPU::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList *boxes, Entity *source) // { // AABB *aabb = getAABB(level, x, y, z); // if (aabb != NULL && box->intersects(aabb)) boxes->push_back(aabb); // } -// +// // void Tile_SPU::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList *boxes) // { // AABB *aabb = getAABB(level, x, y, z); // if (aabb != NULL && box->intersects(aabb)) boxes->push_back(aabb); // } -// +// // AABB *Tile_SPU::getAABB(Level *level, int x, int y, int z) // { // return AABB::newTemp(x + xx0, y + yy0, z + zz0, x + xx1, y + yy1, z + zz1); // } -// +// bool Tile_SPU::isSolidRender(bool isServerLevel) { return true; @@ -239,67 +239,67 @@ Icon_SPU *Tile_SPU::getTexture(int face) // { // return mayPick(); // } -// +// // bool Tile_SPU::mayPick() // { // return true; // } -// +// // void Tile_SPU::tick(Level *level, int x, int y, int z, Random *random) // { // } -// +// // void Tile_SPU::animateTick(Level *level, int x, int y, int z, Random *random) // { // } -// +// // void Tile_SPU::destroy(Level *level, int x, int y, int z, int data) // { // } -// +// // void Tile_SPU::neighborChanged(Level *level, int x, int y, int z, int type) // { // } -// +// // void Tile_SPU::addLights(Level *level, int x, int y, int z) // { // } -// +// // int Tile_SPU::getTickDelay() // { // return 10; // } -// +// // void Tile_SPU::onPlace(Level *level, int x, int y, int z) // { // } -// +// // void Tile_SPU::onRemove(Level *level, int x, int y, int z) // { // } -// +// // int Tile_SPU::getResourceCount(Random *random) // { // return 1; // } -// +// // int Tile_SPU::getResource(int data, Random *random, int playerBonusLevel) // { // return id; // } -// -// float Tile_SPU::getDestroyProgress(std::shared_ptr<Player> player) +// +// float Tile_SPU::getDestroyProgress(shared_ptr<Player> player) // { // if (destroySpeed < 0) return 0; // if (!player->canDestroy(this)) return 1 / destroySpeed / 100.0f; // return (player->getDestroySpeed(this) / destroySpeed) / 30; // } -// +// // void Tile_SPU::spawnResources(Level *level, int x, int y, int z, int data, int playerBonusLevel) // { // spawnResources(level, x, y, z, data, 1, playerBonusLevel); // } -// +// // void Tile_SPU::spawnResources(Level *level, int x, int y, int z, int data, float odds, int playerBonusLevel) // { // if (level->isClientSide) return; @@ -309,24 +309,24 @@ Icon_SPU *Tile_SPU::getTexture(int face) // if (level->random->nextFloat() > odds) continue; // int type = getResource(data, level->random, playerBonusLevel); // if (type <= 0) continue; -// -// popResource(level, x, y, z, std::shared_ptr<ItemInstance>( new ItemInstance(type, 1, getSpawnResourcesAuxValue(data) ) ) ); +// +// popResource(level, x, y, z, shared_ptr<ItemInstance>( new ItemInstance(type, 1, getSpawnResourcesAuxValue(data) ) ) ); // } // } -// -// void Tile_SPU::popResource(Level *level, int x, int y, int z, std::shared_ptr<ItemInstance> itemInstance) +// +// void Tile_SPU::popResource(Level *level, int x, int y, int z, shared_ptr<ItemInstance> itemInstance) // { // if( level->isClientSide ) return; -// +// // float s = 0.7f; // double xo = level->random->nextFloat() * s + (1 - s) * 0.5; // double yo = level->random->nextFloat() * s + (1 - s) * 0.5; // double zo = level->random->nextFloat() * s + (1 - s) * 0.5; -// std::shared_ptr<ItemEntity> item = std::shared_ptr<ItemEntity>( new ItemEntity(level, x + xo, y + yo, z + zo, itemInstance ) ); +// shared_ptr<ItemEntity> item = shared_ptr<ItemEntity>( new ItemEntity(level, x + xo, y + yo, z + zo, itemInstance ) ); // item->throwTime = 10; // level->addEntity(item); // } -// +// // // Brought forward for TU7 // void Tile_SPU::popExperience(Level *level, int x, int y, int z, int amount) // { @@ -336,182 +336,182 @@ Icon_SPU *Tile_SPU::getTexture(int face) // { // int newCount = ExperienceOrb::getExperienceValue(amount); // amount -= newCount; -// level->addEntity(std::shared_ptr<ExperienceOrb>( new ExperienceOrb(level, x + .5, y + .5, z + .5, newCount))); +// level->addEntity(shared_ptr<ExperienceOrb>( new ExperienceOrb(level, x + .5, y + .5, z + .5, newCount))); // } // } // } -// +// // int Tile_SPU::getSpawnResourcesAuxValue(int data) // { // return 0; // } -// -// float Tile_SPU::getExplosionResistance(std::shared_ptr<Entity> source) +// +// float Tile_SPU::getExplosionResistance(shared_ptr<Entity> source) // { // return explosionResistance / 5.0f; // } -// +// // HitResult *Tile_SPU::clip(Level *level, int xt, int yt, int zt, Vec3 *a, Vec3 *b) // { // EnterCriticalSection(&m_csShape); // updateShape(level, xt, yt, zt); -// +// // a = a->add(-xt, -yt, -zt); // b = b->add(-xt, -yt, -zt); -// +// // Vec3 *xh0 = a->clipX(b, xx0); // Vec3 *xh1 = a->clipX(b, xx1); -// +// // Vec3 *yh0 = a->clipY(b, yy0); // Vec3 *yh1 = a->clipY(b, yy1); -// +// // Vec3 *zh0 = a->clipZ(b, zz0); // Vec3 *zh1 = a->clipZ(b, zz1); -// +// // Vec3 *closest = NULL; -// +// // if (containsX(xh0) && (closest == NULL || a->distanceTo(xh0) < a->distanceTo(closest))) closest = xh0; // if (containsX(xh1) && (closest == NULL || a->distanceTo(xh1) < a->distanceTo(closest))) closest = xh1; // if (containsY(yh0) && (closest == NULL || a->distanceTo(yh0) < a->distanceTo(closest))) closest = yh0; // if (containsY(yh1) && (closest == NULL || a->distanceTo(yh1) < a->distanceTo(closest))) closest = yh1; // if (containsZ(zh0) && (closest == NULL || a->distanceTo(zh0) < a->distanceTo(closest))) closest = zh0; // if (containsZ(zh1) && (closest == NULL || a->distanceTo(zh1) < a->distanceTo(closest))) closest = zh1; -// +// // LeaveCriticalSection(&m_csShape); -// +// // if (closest == NULL) return NULL; -// +// // int face = -1; -// +// // if (closest == xh0) face = 4; // if (closest == xh1) face = 5; // if (closest == yh0) face = 0; // if (closest == yh1) face = 1; // if (closest == zh0) face = 2; // if (closest == zh1) face = 3; -// +// // return new HitResult(xt, yt, zt, face, closest->add(xt, yt, zt)); // } -// +// // bool Tile_SPU::containsX(Vec3 *v) // { // if( v == NULL) return false; // return v->y >= yy0 && v->y <= yy1 && v->z >= zz0 && v->z <= zz1; // } -// +// // bool Tile_SPU::containsY(Vec3 *v) // { // if( v == NULL) return false; // return v->x >= xx0 && v->x <= xx1 && v->z >= zz0 && v->z <= zz1; // } -// +// // bool Tile_SPU::containsZ(Vec3 *v) // { // if( v == NULL) return false; // return v->x >= xx0 && v->x <= xx1 && v->y >= yy0 && v->y <= yy1; // } -// +// // void Tile_SPU::wasExploded(Level *level, int x, int y, int z) // { // } -// +// int Tile_SPU::getRenderLayer() { return 0; } -// +// // bool Tile_SPU::mayPlace(Level *level, int x, int y, int z, int face) // { // return mayPlace(level, x, y, z); // } -// +// // bool Tile_SPU::mayPlace(Level *level, int x, int y, int z) // { // int t = level->getTile(x, y, z); // return t == 0 || Tile_SPU::tiles[t]->material->isReplaceable(); // } -// +// // // 4J-PB - Adding a TestUse for tooltip display // bool Tile_SPU::TestUse() // { // return false; // } -// -// bool Tile_SPU::TestUse(Level *level, int x, int y, int z, std::shared_ptr<Player> player) +// +// bool Tile_SPU::TestUse(Level *level, int x, int y, int z, shared_ptr<Player> player) // { // return false; // } -// -// bool Tile_SPU::use(Level *level, int x, int y, int z, std::shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly/*=false*/) // 4J added soundOnly param +// +// bool Tile_SPU::use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly/*=false*/) // 4J added soundOnly param // { // return false; // } -// -// void Tile_SPU::stepOn(Level *level, int x, int y, int z, std::shared_ptr<Entity> entity) +// +// void Tile_SPU::stepOn(Level *level, int x, int y, int z, shared_ptr<Entity> entity) // { // } -// +// // void Tile_SPU::setPlacedOnFace(Level *level, int x, int y, int z, int face) // { // } -// +// // void Tile_SPU::prepareRender(Level *level, int x, int y, int z) // { // } -// -// void Tile_SPU::attack(Level *level, int x, int y, int z, std::shared_ptr<Player> player) +// +// void Tile_SPU::attack(Level *level, int x, int y, int z, shared_ptr<Player> player) // { // } -// -// void Tile_SPU::handleEntityInside(Level *level, int x, int y, int z, std::shared_ptr<Entity> e, Vec3 *current) +// +// void Tile_SPU::handleEntityInside(Level *level, int x, int y, int z, shared_ptr<Entity> e, Vec3 *current) // { // } -// +// void Tile_SPU::updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData, TileEntity* forceEntity) // 4J added forceData, forceEntity param { } -// +// int Tile_SPU::getColor(ChunkRebuildData *level, int x, int y, int z) { return 0xffffff; } -// +// // int Tile_SPU::getColor(LevelSource *level, int x, int y, int z, int data) // { // return 0xffffff; // } -// +// // bool Tile_SPU::getSignal(LevelSource *level, int x, int y, int z) // { // return false; // } -// +// // bool Tile_SPU::getSignal(LevelSource *level, int x, int y, int z, int dir) // { // return false; // } -// +// // bool Tile_SPU::isSignalSource() // { // return false; // } -// -// void Tile_SPU::entityInside(Level *level, int x, int y, int z, std::shared_ptr<Entity> entity) +// +// void Tile_SPU::entityInside(Level *level, int x, int y, int z, shared_ptr<Entity> entity) // { // } -// +// // bool Tile_SPU::getDirectSignal(Level *level, int x, int y, int z, int dir) // { // return false; // } -// +// void Tile_SPU::updateDefaultShape() { } -// -// void Tile_SPU::playerDestroy(Level *level, std::shared_ptr<Player> player, int x, int y, int z, int data) +// +// void Tile_SPU::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y, int z, int data) // { // // 4J Stu - Special case - only record a crop destroy if is fully grown // if(id==Tile_SPU::crops_Id) @@ -525,14 +525,14 @@ void Tile_SPU::updateDefaultShape() // } // player->awardStat(Stats::totalBlocksMined, 1); // 4J : WESTY : Added for other award. // player->causeFoodExhaustion(FoodConstants::EXHAUSTION_MINE); -// +// // if( id == Tile_SPU::treeTrunk_Id ) // player->awardStat(Achievements::mineWood); -// -// +// +// // if (isCubeShaped() && !isEntityTile[id] && EnchantmentHelper::hasSilkTouch(player->inventory)) // { -// std::shared_ptr<ItemInstance> item = getSilkTouchItemInstance(data); +// shared_ptr<ItemInstance> item = getSilkTouchItemInstance(data); // if (item != NULL) // { // popResource(level, x, y, z, item); @@ -544,78 +544,78 @@ void Tile_SPU::updateDefaultShape() // spawnResources(level, x, y, z, data, playerBonusLevel); // } // } -// -// std::shared_ptr<ItemInstance> Tile_SPU::getSilkTouchItemInstance(int data) +// +// shared_ptr<ItemInstance> Tile_SPU::getSilkTouchItemInstance(int data) // { // int popData = 0; // if (id >= 0 && id < Item::items.length && Item::items[id]->isStackedByData()) // { // popData = data; // } -// return std::shared_ptr<ItemInstance>(new ItemInstance(id, 1, popData)); +// return shared_ptr<ItemInstance>(new ItemInstance(id, 1, popData)); // } -// +// // int Tile_SPU::getResourceCountForLootBonus(int bonusLevel, Random *random) // { // return getResourceCount(random); // } -// +// // bool Tile_SPU::canSurvive(Level *level, int x, int y, int z) // { // return true; // } -// -// void Tile_SPU::setPlacedBy(Level *level, int x, int y, int z, std::shared_ptr<Mob> by) +// +// void Tile_SPU::setPlacedBy(Level *level, int x, int y, int z, shared_ptr<Mob> by) // { // } -// +// // Tile *Tile_SPU::setDescriptionId(unsigned int id) // { // this->descriptionId = id; // return this; // } -// +// // wstring Tile_SPU::getName() // { // return I18n::get(getDescriptionId() + L".name"); // } -// +// // unsigned int Tile_SPU::getDescriptionId(int iData /*= -1*/) // { // return descriptionId; // } -// +// // Tile *Tile_SPU::setUseDescriptionId(unsigned int id) // { // this->useDescriptionId = id; // return this; // } -// +// // unsigned int Tile_SPU::getUseDescriptionId() // { // return useDescriptionId; // } -// +// // void Tile_SPU::triggerEvent(Level *level, int x, int y, int z, int b0, int b1) // { // } -// +// // bool Tile_SPU::isCollectStatistics() // { // return collectStatistics; // } -// +// // Tile *Tile_SPU::setNotCollectStatistics() // { // collectStatistics = false; // return this; // } -// +// // int Tile_SPU::getPistonPushReaction() // { // return material->getPushReaction(); // } -// +// // // 4J - brought forward from 1.8.2 float Tile_SPU::getShadeBrightness(ChunkRebuildData *level, int x, int y, int z) { @@ -629,37 +629,37 @@ Tile_SPU* Tile_SPU::createFromID( int tileID ) if(m_tiles[tileID].id != -1) return &m_tiles[tileID]; - + #ifndef SN_TARGET_PS3_SPU app.DebugPrintf("missing tile ID %d\n", tileID); #else spu_print("missing tile ID %d\n", tileID); -#endif +#endif return &m_tiles[1]; } Material_SPU* Tile_SPU::getMaterial() { - int matID = ms_pTileData->materialIDs[id]; + int matID = ms_pTileData->materialIDs[id]; return &ms_pTileData->materials[matID]; } -// -// void Tile_SPU::fallOn(Level *level, int x, int y, int z, std::shared_ptr<Entity> entity, float fallDistance) +// +// void Tile_SPU::fallOn(Level *level, int x, int y, int z, shared_ptr<Entity> entity, float fallDistance) // { // } -// +// // void Tile_SPU::registerIcons(IconRegister *iconRegister) // { // icon = iconRegister->registerIcon(m_textureName); // } -// +// // wstring Tile_SPU::getTileItemIconName() // { // return L""; // } -// +// // Tile *Tile_SPU::setTextureName(const wstring &name) // { // m_textureName = name; @@ -690,7 +690,7 @@ void Tile_SPU::initTilePointers() CREATE_TILE_TYPE(stairs_wood_Id, StairTile_SPU); CREATE_TILE_TYPE(stairs_stone_Id, StairTile_SPU); - CREATE_TILE_TYPE(stairs_bricks_Id, StairTile_SPU); + CREATE_TILE_TYPE(stairs_bricks_Id, StairTile_SPU); CREATE_TILE_TYPE(stairs_stoneBrickSmooth_Id, StairTile_SPU); CREATE_TILE_TYPE(stairs_netherBricks_Id, StairTile_SPU); CREATE_TILE_TYPE(stairs_sandstone_Id, StairTile_SPU); @@ -863,7 +863,7 @@ void Tile_SPU::initTilePointers() CREATE_TILE_TYPE(goldOre_Id, Tile_SPU); // OreTile CREATE_TILE_TYPE(ironOre_Id, Tile_SPU); // OreTile CREATE_TILE_TYPE(coalOre_Id, Tile_SPU); // OreTile - CREATE_TILE_TYPE(lapisOre_Id, Tile_SPU); // OreTile + CREATE_TILE_TYPE(lapisOre_Id, Tile_SPU); // OreTile CREATE_TILE_TYPE(diamondOre_Id, Tile_SPU); // OreTile CREATE_TILE_TYPE(clay_Id, Tile_SPU); // ClayTile CREATE_TILE_TYPE(redStoneOre_Id, Tile_SPU); // RedStoneOreTile @@ -884,7 +884,7 @@ void Tile_SPU::initTilePointers() CREATE_TILE_TYPE(enderChest_Id, EnderChestTile_SPU); CREATE_TILE_TYPE(tripWireSource_Id, TripWireSourceTile_SPU); CREATE_TILE_TYPE(tripWire_Id, TripWireTile_SPU); -// +// CREATE_TILE_TYPE(emeraldBlock_Id, Tile_SPU); // MetalTile CREATE_TILE_TYPE(cobbleWall_Id, WallTile_SPU); CREATE_TILE_TYPE(flowerPot_Id, FlowerPotTile_SPU); diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp index 3de39461..0912e33a 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp @@ -21,7 +21,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 // #define SPU_HEAPSIZE (128*1024) // #define SPU_STACKSIZE (16*1024) -// +// // CELL_SPU_LS_PARAM(128*1024, 16*1024); // can't use #defines here as it seems to create an asm instruction @@ -132,7 +132,7 @@ bool LevelRenderer_FindNearestChunk_DataIn::MultiplayerChunkCache::getChunkEmpty } -bool LevelRenderer_FindNearestChunk_DataIn::CompressedTileStorage::isRenderChunkEmpty(int y) // y == 0, 16, 32... 112 (representing a 16 byte range) +bool LevelRenderer_FindNearestChunk_DataIn::CompressedTileStorage::isRenderChunkEmpty(int y) // y == 0, 16, 32... 112 (representing a 16 byte range) { int blockIdx; unsigned short *blockIndices = (unsigned short *)indicesAndData; @@ -162,30 +162,30 @@ void LevelRenderer_FindNearestChunk_DataIn::findNearestChunk() unsigned char* globalChunkFlags = (unsigned char*)alloca(numGlobalChunks); // 164K !!! DmaData_SPU::getAndWait(globalChunkFlags, (uintptr_t)pGlobalChunkFlags, sizeof(unsigned char)*numGlobalChunks); - + nearChunk = NULL; // Nearest chunk that is dirty veryNearCount = 0; int minDistSq = 0x7fffffff; // Distances to this chunk - + // Find nearest chunk that is dirty for( int p = 0; p < 4; p++ ) { // It's possible that the localplayers member can be set to NULL on the main thread when a player chooses to exit the game - // So take a reference to the player object now. As it is a std::shared_ptr it should live as long as we need it - PlayerData* player = &playerData[p]; + // So take a reference to the player object now. As it is a shared_ptr it should live as long as we need it + PlayerData* player = &playerData[p]; if( player->bValid == NULL ) continue; if( chunks[p] == NULL ) continue; if( level[p] == NULL ) continue; if( chunkLengths[p] != xChunks * zChunks * CHUNK_Y_COUNT ) continue; int px = (int)player->x; int py = (int)player->y; - int pz = (int)player->z; + int pz = (int)player->z; ClipChunk clipChunk[512]; for( int z = 0; z < zChunks; z++ ) - { + { uintptr_t ClipChunkX_PPU = (uintptr_t)&chunks[p][(z * yChunks + 0) * xChunks + 0]; DmaData_SPU::getAndWait(&clipChunk[0], ClipChunkX_PPU, sizeof(ClipChunk) * xChunks*CHUNK_Y_COUNT); for( int y = 0; y < CHUNK_Y_COUNT; y++ ) @@ -196,7 +196,7 @@ void LevelRenderer_FindNearestChunk_DataIn::findNearestChunk() // Get distance to this chunk - deliberately not calling the chunk's method of doing this to avoid overheads (passing entitie, type conversion etc.) that this involves int xd = pClipChunk->xm - px; - int yd = pClipChunk->ym - py; + int yd = pClipChunk->ym - py; int zd = pClipChunk->zm - pz; int distSq = xd * xd + yd * yd + zd * zd; int distSqWeighted = xd * xd + yd * yd * 4 + zd * zd; // Weighting against y to prioritise things in same x/z plane as player first @@ -257,12 +257,12 @@ void cellSpursJobQueueMain(CellSpursJobContext2 *pContext, CellSpursJob256 *pJob spu_print("LevelRenderer_cull [SPU#%u] start\n", idSpu); g_pSpursJobContext = pContext; - uint32_t eaDataIn = pJob->workArea.userData[0]; + uint32_t eaDataIn = pJob->workArea.userData[0]; // uint32_t eaDataOut =pJob->workArea.userData[1]; LevelRenderer_FindNearestChunk_DataIn dataIn; DmaData_SPU::getAndWait(&dataIn, eaDataIn, sizeof(LevelRenderer_FindNearestChunk_DataIn)); - + dataIn.findNearestChunk(); DmaData_SPU::putAndWait(&dataIn, eaDataIn, sizeof(LevelRenderer_FindNearestChunk_DataIn)); diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.h b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.h index a6c3ef2a..55ffcabd 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.h +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.h @@ -23,7 +23,7 @@ public: int xm, ym, zm; }; - class AABB + class AABB { double x0, y0, z0; double x1, y1, z1; @@ -64,7 +64,7 @@ public: int id; int padding[1]; //public: - // vector<std::shared_ptr<TileEntity> > renderableTileEntities; // 4J - removed + // vector<shared_ptr<TileEntity> > renderableTileEntities; // 4J - removed private: void *globalRenderableTileEntities; @@ -86,7 +86,7 @@ public: MultiplayerChunkCache multiplayerChunkCache[4]; int lowerOffset; // offsets into the level class, we don't want to compile the entire class - int upperOffset; + int upperOffset; int xChunks, yChunks, zChunks; |