|
|
Boost-Commit : |
From: nesotto_at_[hidden]
Date: 2008-06-12 08:00:05
Author: nesotto
Date: 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
New Revision: 46347
URL: http://svn.boost.org/trac/boost/changeset/46347
Log:
fixed minor problems reported in Trac
Text files modified:
trunk/boost/ptr_container/clone_allocator.hpp | 2 +-
trunk/boost/ptr_container/detail/map_iterator.hpp | 9 +++++++++
trunk/boost/ptr_container/detail/serialize_ptr_map_adapter.hpp | 6 +++---
trunk/boost/ptr_container/detail/serialize_reversible_cont.hpp | 4 ++--
trunk/boost/ptr_container/ptr_array.hpp | 4 ++--
trunk/boost/ptr_container/ptr_circular_buffer.hpp | 2 +-
trunk/boost/ptr_container/ptr_deque.hpp | 2 +-
trunk/boost/ptr_container/ptr_list.hpp | 2 +-
trunk/boost/ptr_container/ptr_map.hpp | 4 ++--
trunk/boost/ptr_container/ptr_map_adapter.hpp | 3 +++
trunk/boost/ptr_container/ptr_set.hpp | 4 ++--
trunk/boost/ptr_container/ptr_unordered_map.hpp | 4 ++--
trunk/boost/ptr_container/ptr_unordered_set.hpp | 6 +++---
trunk/boost/ptr_container/ptr_vector.hpp | 2 +-
trunk/boost/ptr_container/serialize_ptr_array.hpp | 4 ++--
trunk/boost/ptr_container/serialize_ptr_vector.hpp | 2 +-
16 files changed, 36 insertions(+), 24 deletions(-)
Modified: trunk/boost/ptr_container/clone_allocator.hpp
==============================================================================
--- trunk/boost/ptr_container/clone_allocator.hpp (original)
+++ trunk/boost/ptr_container/clone_allocator.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -74,7 +74,7 @@
}
template< class U >
- static void deallocate_clone( const U* r )
+ static void deallocate_clone( const U* /*r*/ )
{
// do nothing
}
Modified: trunk/boost/ptr_container/detail/map_iterator.hpp
==============================================================================
--- trunk/boost/ptr_container/detail/map_iterator.hpp (original)
+++ trunk/boost/ptr_container/detail/map_iterator.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -21,6 +21,11 @@
#include <boost/utility/compare_pointees.hpp>
#include <utility>
+#if defined(BOOST_MSVC)
+# pragma warning(push)
+# pragma warning(disable:4512) // Assignment operator could not be generated.
+#endif
+
namespace boost
{
namespace ptr_container_detail
@@ -120,4 +125,8 @@
}
+#if defined(BOOST_MSVC)
+# pragma warning(pop)
+#endif
+
#endif
Modified: trunk/boost/ptr_container/detail/serialize_ptr_map_adapter.hpp
==============================================================================
--- trunk/boost/ptr_container/detail/serialize_ptr_map_adapter.hpp (original)
+++ trunk/boost/ptr_container/detail/serialize_ptr_map_adapter.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -17,7 +17,7 @@
{
template<class Archive, class T, class VoidPtrMap, class CloneAllocator, bool Ordered>
-void save(Archive& ar, const ptr_container_detail::ptr_map_adapter_base<T, VoidPtrMap, CloneAllocator,Ordered>& c, unsigned int version)
+void save(Archive& ar, const ptr_container_detail::ptr_map_adapter_base<T, VoidPtrMap, CloneAllocator,Ordered>& c, unsigned int /*version*/)
{
typedef ptr_container_detail::ptr_map_adapter_base<T, VoidPtrMap, CloneAllocator,Ordered> container;
typedef BOOST_DEDUCED_TYPENAME container::const_iterator const_iterator;
@@ -35,7 +35,7 @@
}
template<class Archive, class T, class VoidPtrMap, class CloneAllocator, bool Ordered>
-void load(Archive& ar, ptr_map_adapter<T, VoidPtrMap, CloneAllocator,Ordered>& c, unsigned int version)
+void load(Archive& ar, ptr_map_adapter<T, VoidPtrMap, CloneAllocator,Ordered>& c, unsigned int /*version*/)
{
typedef ptr_map_adapter<T, VoidPtrMap, CloneAllocator,Ordered> container;
typedef BOOST_DEDUCED_TYPENAME container::key_type key_type;
@@ -58,7 +58,7 @@
}
template<class Archive, class T, class VoidPtrMap, class CloneAllocator, bool Ordered>
-void load(Archive& ar, ptr_multimap_adapter<T, VoidPtrMap, CloneAllocator,Ordered>& c, unsigned int version)
+void load(Archive& ar, ptr_multimap_adapter<T, VoidPtrMap, CloneAllocator,Ordered>& c, unsigned int /*version*/)
{
typedef ptr_multimap_adapter<T, VoidPtrMap, CloneAllocator,Ordered> container;
typedef BOOST_DEDUCED_TYPENAME container::key_type key_type;
Modified: trunk/boost/ptr_container/detail/serialize_reversible_cont.hpp
==============================================================================
--- trunk/boost/ptr_container/detail/serialize_reversible_cont.hpp (original)
+++ trunk/boost/ptr_container/detail/serialize_reversible_cont.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -66,7 +66,7 @@
{
template<class Archive, class Config, class CloneAllocator>
-void save(Archive& ar, const ptr_container_detail::reversible_ptr_container<Config, CloneAllocator>& c, unsigned int version)
+void save(Archive& ar, const ptr_container_detail::reversible_ptr_container<Config, CloneAllocator>& c, unsigned int /*version*/)
{
ar << boost::serialization::make_nvp( ptr_container_detail::count(),
ptr_container_detail::serialize_as_const(c.size()) );
@@ -74,7 +74,7 @@
}
template<class Archive, class Config, class CloneAllocator>
-void load(Archive& ar, ptr_container_detail::reversible_ptr_container<Config, CloneAllocator>& c, unsigned int version)
+void load(Archive& ar, ptr_container_detail::reversible_ptr_container<Config, CloneAllocator>& c, unsigned int /*version*/)
{
typedef ptr_container_detail::reversible_ptr_container<Config, CloneAllocator> container_type;
typedef BOOST_DEDUCED_TYPENAME container_type::size_type size_type;
Modified: trunk/boost/ptr_container/ptr_array.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_array.hpp (original)
+++ trunk/boost/ptr_container/ptr_array.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -36,12 +36,12 @@
public:
typedef Allocator allocator_type;
- ptr_array_impl( Allocator a = Allocator() )
+ ptr_array_impl( Allocator /*a*/ = Allocator() )
{
this->assign( 0 );
}
- ptr_array_impl( size_t, T*, Allocator a = Allocator() )
+ ptr_array_impl( size_t, T*, Allocator /*a*/ = Allocator() )
{
this->assign( 0 );
}
Modified: trunk/boost/ptr_container/ptr_circular_buffer.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_circular_buffer.hpp (original)
+++ trunk/boost/ptr_container/ptr_circular_buffer.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -105,7 +105,7 @@
}
BOOST_PTR_CONTAINER_DEFINE_RELEASE_AND_CLONE( ptr_circular_buffer,
- base_type, this_type );
+ base_type, this_type )
public: // allocators
allocator_type& get_allocator()
Modified: trunk/boost/ptr_container/ptr_deque.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_deque.hpp (original)
+++ trunk/boost/ptr_container/ptr_deque.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -44,7 +44,7 @@
BOOST_PTR_CONTAINER_DEFINE_SEQEUENCE_MEMBERS( ptr_deque,
base_class,
- this_type );
+ this_type )
};
//////////////////////////////////////////////////////////////////////////////
Modified: trunk/boost/ptr_container/ptr_list.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_list.hpp (original)
+++ trunk/boost/ptr_container/ptr_list.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -43,7 +43,7 @@
public:
BOOST_PTR_CONTAINER_DEFINE_SEQEUENCE_MEMBERS( ptr_list,
base_class,
- this_type );
+ this_type )
public:
using base_class::merge;
Modified: trunk/boost/ptr_container/ptr_map.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_map.hpp (original)
+++ trunk/boost/ptr_container/ptr_map.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -61,7 +61,7 @@
{ }
BOOST_PTR_CONTAINER_DEFINE_RELEASE_AND_CLONE( ptr_map, base_type,
- this_type );
+ this_type )
template< class U >
ptr_map( const ptr_map<Key,U>& r ) : base_type( r )
@@ -117,7 +117,7 @@
BOOST_PTR_CONTAINER_DEFINE_RELEASE_AND_CLONE( ptr_multimap,
base_type,
- this_type );
+ this_type )
template< class U >
ptr_multimap( const ptr_multimap<Key,U>& r ) : base_type( r )
Modified: trunk/boost/ptr_container/ptr_map_adapter.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_map_adapter.hpp (original)
+++ trunk/boost/ptr_container/ptr_map_adapter.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -195,6 +195,9 @@
}
void release() { released_ = true; }
+
+ private:
+ eraser& operator=(const eraser&);
};
mapped_reference insert_lookup( const key_type& key )
Modified: trunk/boost/ptr_container/ptr_set.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_set.hpp (original)
+++ trunk/boost/ptr_container/ptr_set.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -64,7 +64,7 @@
BOOST_PTR_CONTAINER_DEFINE_RELEASE_AND_CLONE( ptr_set,
base_type,
- this_type );
+ this_type )
BOOST_PTR_CONTAINER_DEFINE_COPY_CONSTRUCTORS( ptr_set, base_type )
};
@@ -112,7 +112,7 @@
BOOST_PTR_CONTAINER_DEFINE_RELEASE_AND_CLONE( ptr_multiset,
base_type,
- this_type );
+ this_type )
BOOST_PTR_CONTAINER_DEFINE_COPY_CONSTRUCTORS( ptr_multiset,
base_type );
Modified: trunk/boost/ptr_container/ptr_unordered_map.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_unordered_map.hpp (original)
+++ trunk/boost/ptr_container/ptr_unordered_map.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -101,7 +101,7 @@
BOOST_PTR_CONTAINER_DEFINE_RELEASE_AND_CLONE( ptr_unordered_map,
base_type,
- this_type );
+ this_type )
template< class U >
ptr_unordered_map( const ptr_unordered_map<Key,U>& r ) : base_type( r )
@@ -196,7 +196,7 @@
BOOST_PTR_CONTAINER_DEFINE_RELEASE_AND_CLONE( ptr_unordered_multimap,
base_type,
- this_type );
+ this_type )
template< class U >
ptr_unordered_multimap( const ptr_unordered_multimap<Key,U>& r ) : base_type( r )
Modified: trunk/boost/ptr_container/ptr_unordered_set.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_unordered_set.hpp (original)
+++ trunk/boost/ptr_container/ptr_unordered_set.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -105,7 +105,7 @@
BOOST_PTR_CONTAINER_DEFINE_RELEASE_AND_CLONE( ptr_unordered_set,
base_type,
- this_type );
+ this_type )
BOOST_PTR_CONTAINER_DEFINE_COPY_CONSTRUCTORS( ptr_unordered_set, base_type )
};
@@ -193,9 +193,9 @@
BOOST_PTR_CONTAINER_DEFINE_RELEASE_AND_CLONE( ptr_unordered_multiset,
base_type,
- this_type );
+ this_type )
BOOST_PTR_CONTAINER_DEFINE_COPY_CONSTRUCTORS( ptr_unordered_multiset,
- base_type );
+ base_type )
};
Modified: trunk/boost/ptr_container/ptr_vector.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_vector.hpp (original)
+++ trunk/boost/ptr_container/ptr_vector.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -44,7 +44,7 @@
BOOST_PTR_CONTAINER_DEFINE_SEQEUENCE_MEMBERS( ptr_vector,
base_class,
- this_type );
+ this_type )
explicit ptr_vector( size_type n,
const allocator_type& alloc = allocator_type() )
Modified: trunk/boost/ptr_container/serialize_ptr_array.hpp
==============================================================================
--- trunk/boost/ptr_container/serialize_ptr_array.hpp (original)
+++ trunk/boost/ptr_container/serialize_ptr_array.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -16,13 +16,13 @@
{
template<class Archive, class T, std::size_t N, class CloneAllocator>
-void save(Archive& ar, const ptr_array<T, N, CloneAllocator>& c, unsigned int version)
+void save(Archive& ar, const ptr_array<T, N, CloneAllocator>& c, unsigned int /*version*/)
{
ptr_container_detail::save_helper(ar, c);
}
template<class Archive, class T, std::size_t N, class CloneAllocator>
-void load(Archive& ar, ptr_array<T, N, CloneAllocator>& c, unsigned int version)
+void load(Archive& ar, ptr_array<T, N, CloneAllocator>& c, unsigned int /*version*/)
{
typedef ptr_array<T, N, CloneAllocator> container_type;
typedef BOOST_DEDUCED_TYPENAME container_type::size_type size_type;
Modified: trunk/boost/ptr_container/serialize_ptr_vector.hpp
==============================================================================
--- trunk/boost/ptr_container/serialize_ptr_vector.hpp (original)
+++ trunk/boost/ptr_container/serialize_ptr_vector.hpp 2008-06-12 08:00:04 EDT (Thu, 12 Jun 2008)
@@ -16,7 +16,7 @@
{
template<class Archive, class T, class CloneAllocator, class Allocator>
-void load(Archive& ar, ptr_vector<T, CloneAllocator, Allocator>& c, unsigned int version)
+void load(Archive& ar, ptr_vector<T, CloneAllocator, Allocator>& c, unsigned int /*version*/)
{
typedef ptr_vector<T, CloneAllocator, Allocator> container_type;
typedef BOOST_DEDUCED_TYPENAME container_type::size_type size_type;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk