Subject: [Boost-commit] svn:boost r76666 - in trunk/boost: archive/iterators serialization
From: ramey_at_[hidden]
Date: 2012-01-24 14:31:19
Author: ramey
Date: 2012-01-24 14:31:17 EST (Tue, 24 Jan 2012)
New Revision: 76666
URL: http://svn.boost.org/trac/boost/changeset/76666
Log:
small changes resulting from fixing track items
Text files modified:
trunk/boost/archive/iterators/head_iterator.hpp | 4 ++--
trunk/boost/archive/iterators/remove_whitespace.hpp | 11 +++++++++--
trunk/boost/serialization/extended_type_info_no_rtti.hpp | 2 +-
trunk/boost/serialization/extended_type_info_typeid.hpp | 2 +-
trunk/boost/serialization/force_include.hpp | 6 +++---
5 files changed, 16 insertions(+), 9 deletions(-)
Modified: trunk/boost/archive/iterators/head_iterator.hpp
==============================================================================
--- trunk/boost/archive/iterators/head_iterator.hpp (original)
+++ trunk/boost/archive/iterators/head_iterator.hpp 2012-01-24 14:31:17 EST (Tue, 24 Jan 2012)
@@ -42,8 +42,8 @@
> super_t;
typedef head_iterator<Predicate, Base> this_t;
- typedef BOOST_DEDUCED_TYPENAME super_t::value_type value_type;
- typedef BOOST_DEDUCED_TYPENAME super_t::reference reference_type;
+ typedef super_t::value_type value_type;
+ typedef super_t::reference reference_type;
reference_type dereference_impl(){
if(! m_end){
Modified: trunk/boost/archive/iterators/remove_whitespace.hpp
==============================================================================
--- trunk/boost/archive/iterators/remove_whitespace.hpp (original)
+++ trunk/boost/archive/iterators/remove_whitespace.hpp 2012-01-24 14:31:17 EST (Tue, 24 Jan 2012)
@@ -24,6 +24,7 @@
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/filter_iterator.hpp>
+#include <boost/iterator/iterator_traits.hpp>
//#include <boost/detail/workaround.hpp>
//#if ! BOOST_WORKAROUND(BOOST_MSVC, <=1300)
@@ -140,13 +141,19 @@
template<class Base>
class remove_whitespace :
public filter_iterator<
- remove_whitespace_predicate<BOOST_DEDUCED_TYPENAME Base::value_type>,
+ remove_whitespace_predicate<
+ BOOST_DEDUCED_TYPENAME boost::iterator_value<Base>::type
+ //BOOST_DEDUCED_TYPENAME Base::value_type
+ >,
Base
>
{
friend class boost::iterator_core_access;
typedef filter_iterator<
- remove_whitespace_predicate<BOOST_DEDUCED_TYPENAME Base::value_type>,
+ remove_whitespace_predicate<
+ BOOST_DEDUCED_TYPENAME boost::iterator_value<Base>::type
+ //BOOST_DEDUCED_TYPENAME Base::value_type
+ >,
Base
> super_t;
public:
Modified: trunk/boost/serialization/extended_type_info_no_rtti.hpp
==============================================================================
--- trunk/boost/serialization/extended_type_info_no_rtti.hpp (original)
+++ trunk/boost/serialization/extended_type_info_no_rtti.hpp 2012-01-24 14:31:17 EST (Tue, 24 Jan 2012)
@@ -147,7 +147,7 @@
}
virtual void destroy(void const * const p) const{
boost::serialization::access::destroy(
- static_cast<T const * const>(p)
+ static_cast<T const *>(p)
);
//delete static_cast<T const * const>(p) ;
}
Modified: trunk/boost/serialization/extended_type_info_typeid.hpp
==============================================================================
--- trunk/boost/serialization/extended_type_info_typeid.hpp (original)
+++ trunk/boost/serialization/extended_type_info_typeid.hpp 2012-01-24 14:31:17 EST (Tue, 24 Jan 2012)
@@ -131,7 +131,7 @@
}
virtual void destroy(void const * const p) const {
boost::serialization::access::destroy(
- static_cast<T const * const>(p)
+ static_cast<T const *>(p)
);
//delete static_cast<T const * const>(p);
}
Modified: trunk/boost/serialization/force_include.hpp
==============================================================================
--- trunk/boost/serialization/force_include.hpp (original)
+++ trunk/boost/serialization/force_include.hpp 2012-01-24 14:31:17 EST (Tue, 24 Jan 2012)
@@ -40,11 +40,11 @@
# if defined(__MWERKS__)
# define BOOST_DLLEXPORT __declspec(dllexport)
# elif defined(__GNUC__) && (__GNUC__ >= 3)
-# define BOOST_USED __attribute__ ((used))
+# define BOOST_USED __attribute__ ((__used__))
# elif defined(__IBMCPP__) && (__IBMCPP__ >= 1110)
-# define BOOST_USED __attribute__ ((used))
+# define BOOST_USED __attribute__ ((__used__))
# elif defined(__INTEL_COMPILER) && (BOOST_INTEL_CXX_VERSION >= 800)
-# define BOOST_USED __attribute__ ((used))
+# define BOOST_USED __attribute__ ((__used__))
# endif
#endif