Ticket #1748: ptr_container.patch

File ptr_container.patch, 6.3 KB (added by Richard Webb <richard.webb@…>, 15 years ago)

  • clone_allocator.hpp

     
    7474        }
    7575
    7676        template< class U >
    77         static void deallocate_clone( const U* r )
     77        static void deallocate_clone( const U* /*r*/ )
    7878        {
    7979            // do nothing
    8080        }

  • detail/map_iterator.hpp

     
    2020#include <boost/iterator/iterator_adaptor.hpp>
    2121#include <utility>
    2222
     23#if defined(BOOST_MSVC)
     24# pragma warning(push)
     25# pragma warning(disable:4512)    // Assignment operator could not be generated.
     26#endif
     27
    2328namespace boost
    2429{
    2530    namespace ptr_container_detail
    … …  
    8489
    8590}
    8691
     92#if defined(BOOST_MSVC)
     93# pragma warning(pop)
    8794#endif
     95
     96#endif

  • detail/serialize_ptr_map_adapter.hpp

     
    1717{
    1818
    1919template<class Archive, class T, class VoidPtrMap, class CloneAllocator>
    20 void save(Archive& ar, const ptr_container_detail::ptr_map_adapter_base<T, VoidPtrMap, CloneAllocator>& c, unsigned int version)
     20void save(Archive& ar, const ptr_container_detail::ptr_map_adapter_base<T, VoidPtrMap, CloneAllocator>& c, unsigned int /*version*/)
    2121{
    2222    typedef ptr_container_detail::ptr_map_adapter_base<T, VoidPtrMap, CloneAllocator> container;
    2323    typedef BOOST_DEDUCED_TYPENAME container::const_iterator const_iterator;
    … …  
    3535}
    3636
    3737template<class Archive, class T, class VoidPtrMap, class CloneAllocator>
    38 void load(Archive& ar, ptr_map_adapter<T, VoidPtrMap, CloneAllocator>& c, unsigned int version)
     38void load(Archive& ar, ptr_map_adapter<T, VoidPtrMap, CloneAllocator>& c, unsigned int /*version*/)
    3939{
    4040    typedef ptr_map_adapter<T, VoidPtrMap, CloneAllocator> container;
    4141    typedef BOOST_DEDUCED_TYPENAME container::key_type key_type;
    … …  
    5858}
    5959
    6060template<class Archive, class T, class VoidPtrMap, class CloneAllocator>
    61 void load(Archive& ar, ptr_multimap_adapter<T, VoidPtrMap, CloneAllocator>& c, unsigned int version)
     61void load(Archive& ar, ptr_multimap_adapter<T, VoidPtrMap, CloneAllocator>& c, unsigned int /*version*/)
    6262{
    6363    typedef ptr_multimap_adapter<T, VoidPtrMap, CloneAllocator> container;
    6464    typedef BOOST_DEDUCED_TYPENAME container::key_type key_type;

  • detail/serialize_reversible_cont.hpp

     
    6666{
    6767
    6868template<class Archive, class Config, class CloneAllocator>
    69 void save(Archive& ar, const ptr_container_detail::reversible_ptr_container<Config, CloneAllocator>& c, unsigned int version)
     69void save(Archive& ar, const ptr_container_detail::reversible_ptr_container<Config, CloneAllocator>& c, unsigned int /*version*/)
    7070{   
    7171    ar << boost::serialization::make_nvp( ptr_container_detail::count(),
    7272                                          ptr_container_detail::serialize_as_const(c.size()) );
    … …  
    7474}
    7575
    7676template<class Archive, class Config, class CloneAllocator>
    77 void load(Archive& ar, ptr_container_detail::reversible_ptr_container<Config, CloneAllocator>& c, unsigned int version)
     77void load(Archive& ar, ptr_container_detail::reversible_ptr_container<Config, CloneAllocator>& c, unsigned int /*version*/)
    7878{
    7979    typedef ptr_container_detail::reversible_ptr_container<Config, CloneAllocator> container_type;
    8080    typedef BOOST_DEDUCED_TYPENAME container_type::size_type size_type;

  • ptr_array.hpp

     
    3636        public:
    3737            typedef Allocator allocator_type;
    3838
    39             ptr_array_impl( Allocator a = Allocator() )
     39            ptr_array_impl( Allocator /*a*/ = Allocator() )
    4040            {
    4141                this->assign( 0 );
    4242            }
    4343
    44             ptr_array_impl( size_t, T*, Allocator a = Allocator() )
     44            ptr_array_impl( size_t, T*, Allocator /*a*/ = Allocator() )
    4545            {
    4646                this->assign( 0 );
    4747            }

  • ptr_map_adapter.hpp

     
    153153            }
    154154
    155155            void release() { released_ = true; }
     156        private:
     157            eraser& operator=(const eraser&);
    156158        };
    157159
    158160        mapped_reference insert_lookup( const key_type& key )

  • serialize_ptr_array.hpp

     
    1616{
    1717
    1818template<class Archive, class T, std::size_t N, class CloneAllocator>
    19 void save(Archive& ar, const ptr_array<T, N, CloneAllocator>& c, unsigned int version)
     19void save(Archive& ar, const ptr_array<T, N, CloneAllocator>& c, unsigned int /*version*/)
    2020{
    2121    ptr_container_detail::save_helper(ar, c);
    2222}
    2323
    2424template<class Archive, class T, std::size_t N, class CloneAllocator>
    25 void load(Archive& ar, ptr_array<T, N, CloneAllocator>& c, unsigned int version)
     25void load(Archive& ar, ptr_array<T, N, CloneAllocator>& c, unsigned int /*version*/)
    2626{
    2727    typedef ptr_array<T, N, CloneAllocator> container_type;
    2828    typedef BOOST_DEDUCED_TYPENAME container_type::size_type size_type;

  • serialize_ptr_vector.hpp

     
    1616{
    1717
    1818template<class Archive, class T, class CloneAllocator, class Allocator>
    19 void load(Archive& ar, ptr_vector<T, CloneAllocator, Allocator>& c, unsigned int version)
     19void load(Archive& ar, ptr_vector<T, CloneAllocator, Allocator>& c, unsigned int /*version*/)
    2020{
    2121    typedef ptr_vector<T, CloneAllocator, Allocator> container_type;
    2222    typedef BOOST_DEDUCED_TYPENAME container_type::size_type size_type;