Ticket #7425: bimap-warnings.diff

File bimap-warnings.diff, 5.4 KB (added by Franz Detro <franz.detro@…>, 10 years ago)

  • boost/bimap/bimap.hpp 

    From a18031ce60479c840b9b62c2437ddbd53f4624cc Mon Sep 17 00:00:00 2001
From: Franz Detro <franz.detro@native-instruments.de>
Date: Tue, 4 Sep 2012 14:49:03 +0200
Subject: [PATCH] fix warnings in boost bimap

---
 boost/bimap/bimap.hpp                    | 2 +-
 boost/bimap/detail/map_view_base.hpp     | 2 +-
 boost/bimap/detail/map_view_iterator.hpp | 8 ++++----
 boost/bimap/detail/set_view_iterator.hpp | 8 ++++----
 boost/bimap/relation/mutant_relation.hpp | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/boost/bimap/bimap.hpp b/boost/bimap/bimap.hpp
index 3021b04..e94b9ca 100644
    a b class bimap  
    382382    friend class boost::serialization::access;
    383383
    384384    template<class Archive>
    385     void serialize(Archive & ar, const unsigned int version)
     385    void serialize(Archive & ar, const unsigned int)
    386386    {
    387387        ar & serialization::make_nvp("mi_core",core);
    388388    }

  • boost/bimap/detail/map_view_base.hpp 

    diff --git a/boost/bimap/detail/map_view_base.hpp b/boost/bimap/detail/map_view_base.hpp
index 7900901..1357e65 100644
    a b class non_mutable_data_unique_map_view_access  
    355355    }
    356356
    357357    template< class CompatibleKey >
    358     data_type_ & operator[](const CompatibleKey& k)
     358    data_type_ & operator[](const CompatibleKey&)
    359359    {
    360360        BOOST_BIMAP_STATIC_ERROR( OPERATOR_BRACKET_IS_NOT_SUPPORTED, (Derived));
    361361    }

  • boost/bimap/detail/map_view_iterator.hpp 

    diff --git a/boost/bimap/detail/map_view_iterator.hpp b/boost/bimap/detail/map_view_iterator.hpp
index 4f0e20e..63368c6 100644
    a b struct map_view_iterator : public map_view_iterator_base<Tag,Relation,CoreIterat  
    9797    friend class ::boost::serialization::access;
    9898
    9999    template< class Archive >
    100     void save(Archive & ar, const unsigned int version) const
     100    void save(Archive & ar, const unsigned int) const
    101101    {
    102102        ar << ::boost::serialization::make_nvp("mi_iterator",this->base());
    103103    }
    104104
    105105    template< class Archive >
    106     void load(Archive & ar, const unsigned int version)
     106    void load(Archive & ar, const unsigned int)
    107107    {
    108108        CoreIterator iter;
    109109        ar >> ::boost::serialization::make_nvp("mi_iterator",iter);
    … … struct const_map_view_iterator :  
    178178    friend class ::boost::serialization::access;
    179179
    180180    template< class Archive >
    181     void save(Archive & ar, const unsigned int version) const
     181    void save(Archive & ar, const unsigned int) const
    182182    {
    183183        ar << ::boost::serialization::make_nvp("mi_iterator",this->base());
    184184    }
    185185
    186186    template< class Archive >
    187     void load(Archive & ar, const unsigned int version)
     187    void load(Archive & ar, const unsigned int)
    188188    {
    189189        CoreIterator iter;
    190190        ar >> ::boost::serialization::make_nvp("mi_iterator",iter);

  • boost/bimap/detail/set_view_iterator.hpp 

    diff --git a/boost/bimap/detail/set_view_iterator.hpp b/boost/bimap/detail/set_view_iterator.hpp
index d48f5c0..08d7a42 100644
    a b struct set_view_iterator : public set_view_iterator_base<CoreIterator>::type  
    9595    friend class ::boost::serialization::access;
    9696
    9797    template< class Archive >
    98     void save(Archive & ar, const unsigned int version) const
     98    void save(Archive & ar, const unsigned int) const
    9999    {
    100100        ar << ::boost::serialization::make_nvp("mi_iterator",this->base());
    101101    }
    102102
    103103    template< class Archive >
    104     void load(Archive & ar, const unsigned int version)
     104    void load(Archive & ar, const unsigned int)
    105105    {
    106106        CoreIterator iter;
    107107        ar >> ::boost::serialization::make_nvp("mi_iterator",iter);
    … … struct const_set_view_iterator : public const_set_view_iterator_base<CoreIterato  
    171171    friend class ::boost::serialization::access;
    172172
    173173    template< class Archive >
    174     void save(Archive & ar, const unsigned int version) const
     174    void save(Archive & ar, const unsigned int) const
    175175    {
    176176        ar << ::boost::serialization::make_nvp("mi_iterator",this->base());
    177177    }
    178178
    179179    template< class Archive >
    180     void load(Archive & ar, const unsigned int version)
     180    void load(Archive & ar, const unsigned int)
    181181    {
    182182        CoreIterator iter;
    183183        ar >> ::boost::serialization::make_nvp("mi_iterator",iter);

  • boost/bimap/relation/mutant_relation.hpp 

    diff --git a/boost/bimap/relation/mutant_relation.hpp b/boost/bimap/relation/mutant_relation.hpp
index 9aa28e4..2142906 100644
    a b class relation_info_hook : public  
    142142
    143143    #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
    144144    template< class Archive >
    145     void serialize(Archive & ar, const unsigned int version)
     145    void serialize(Archive & ar, const unsigned int)
    146146    {
    147147        ar & ::boost::serialization::make_nvp("left" , base_::left );
    148148        ar & ::boost::serialization::make_nvp("right", base_::right);
    … … class relation_info_hook<TA,TB,::boost::mpl::na,force_mutable> :  
    188188
    189189    #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
    190190    template< class Archive >
    191     void serialize(Archive & ar, const unsigned int version)
     191    void serialize(Archive & ar, const unsigned int)
    192192    {
    193193        ar & ::boost::serialization::make_nvp("left" , base_::left );
    194194        ar & ::boost::serialization::make_nvp("right", base_::right);