boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-02 14:04:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed clang warnings and errors

Browse Source 
[SVN r78149]
This commit is contained in:
Ion Gaztañaga
2012-04-22 22:54:18 +00:00
parent b5343d43db
commit b18daf85e9
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/container/detail/flat_tree.hpp
View File

@@ -386,7 +386,7 @@ class flat_tree
aligned_storage<sizeof(value_type), alignment_of<value_type>::value> v; aligned_storage<sizeof(value_type), alignment_of<value_type>::value> v;
value_type &val = *static_cast<value_type *>(static_cast<void *>(&v)); value_type &val = *static_cast<value_type *>(static_cast<void *>(&v));
stored_allocator_type &a = this->get_stored_allocator(); stored_allocator_type &a = this->get_stored_allocator();
stored_allocator_traits::construct(a, &val, ::boost::forward(args)... ); stored_allocator_traits::construct(a, &val, ::boost::forward<Args>(args)... );
scoped_destructor<stored_allocator_type> d(a, &val); scoped_destructor<stored_allocator_type> d(a, &val);
insert_commit_data data; insert_commit_data data;
std::pair<iterator,bool> ret = std::pair<iterator,bool> ret =
@@ -404,7 +404,7 @@ class flat_tree
aligned_storage<sizeof(value_type), alignment_of<value_type>::value> v; aligned_storage<sizeof(value_type), alignment_of<value_type>::value> v;
value_type &val = *static_cast<value_type *>(static_cast<void *>(&v)); value_type &val = *static_cast<value_type *>(static_cast<void *>(&v));
stored_allocator_type &a = this->get_stored_allocator(); stored_allocator_type &a = this->get_stored_allocator();
stored_allocator_traits::construct(a, &val, ::boost::forward(args)... ); stored_allocator_traits::construct(a, &val, ::boost::forward<Args>(args)... );
scoped_destructor<stored_allocator_type> d(a, &val); scoped_destructor<stored_allocator_type> d(a, &val);
insert_commit_data data; insert_commit_data data;
std::pair<iterator,bool> ret = priv_insert_unique_prepare(hint, val, data); std::pair<iterator,bool> ret = priv_insert_unique_prepare(hint, val, data);
@@ -421,7 +421,7 @@ class flat_tree
aligned_storage<sizeof(value_type), alignment_of<value_type>::value> v; aligned_storage<sizeof(value_type), alignment_of<value_type>::value> v;
value_type &val = *static_cast<value_type *>(static_cast<void *>(&v)); value_type &val = *static_cast<value_type *>(static_cast<void *>(&v));
stored_allocator_type &a = this->get_stored_allocator(); stored_allocator_type &a = this->get_stored_allocator();
stored_allocator_traits::construct(a, &val, ::boost::forward(args)... ); stored_allocator_traits::construct(a, &val, ::boost::forward<Args>(args)... );
scoped_destructor<stored_allocator_type> d(a, &val); scoped_destructor<stored_allocator_type> d(a, &val);
iterator i = this->upper_bound(KeyOfValue()(val)); iterator i = this->upper_bound(KeyOfValue()(val));
i = this->m_data.m_vect.insert(i, boost::move(val)); i = this->m_data.m_vect.insert(i, boost::move(val));
@@ -435,7 +435,7 @@ class flat_tree
aligned_storage<sizeof(value_type), alignment_of<value_type>::value> v; aligned_storage<sizeof(value_type), alignment_of<value_type>::value> v;
value_type &val = *static_cast<value_type *>(static_cast<void *>(&v)); value_type &val = *static_cast<value_type *>(static_cast<void *>(&v));
stored_allocator_type &a = this->get_stored_allocator(); stored_allocator_type &a = this->get_stored_allocator();
stored_allocator_traits::construct(a, &val, ::boost::forward(args)... ); stored_allocator_traits::construct(a, &val, ::boost::forward<Args>(args)... );
scoped_destructor<stored_allocator_type> d(a, &val); scoped_destructor<stored_allocator_type> d(a, &val);
insert_commit_data data; insert_commit_data data;
this->priv_insert_equal_prepare(hint, val, data); this->priv_insert_equal_prepare(hint, val, data);

21
include/boost/container/scoped_allocator.hpp
View File

@@ -646,24 +646,24 @@ class scoped_allocator_adaptor_base
template <class OuterA2> template <class OuterA2>
scoped_allocator_adaptor_base(BOOST_FWD_REF(OuterA2) outerAlloc, const InnerAllocs &...args) scoped_allocator_adaptor_base(BOOST_FWD_REF(OuterA2) outerAlloc, const InnerAllocs &...args)
: outer_allocator_type(::boost::forward<OuterA2>(outerAlloc)) : outer_allocator_type(::boost::forward<OuterA2>(outerAlloc))
, inner(args...) , m_inner(args...)
{} {}
scoped_allocator_adaptor_base(const scoped_allocator_adaptor_base& other) scoped_allocator_adaptor_base(const scoped_allocator_adaptor_base& other)
: outer_allocator_type(other.outer_allocator()) : outer_allocator_type(other.outer_allocator())
, inner(other.inner_allocator()) , m_inner(other.inner_allocator())
{} {}
scoped_allocator_adaptor_base(BOOST_RV_REF(scoped_allocator_adaptor_base) other) scoped_allocator_adaptor_base(BOOST_RV_REF(scoped_allocator_adaptor_base) other)
: outer_allocator_type(::boost::move(other.outer_allocator())) : outer_allocator_type(::boost::move(other.outer_allocator()))
, inner(::boost::move(other.inner_allocator())) , m_inner(::boost::move(other.inner_allocator()))
{} {}
template <class OuterA2> template <class OuterA2>
scoped_allocator_adaptor_base scoped_allocator_adaptor_base
(const scoped_allocator_adaptor_base<OuterA2, InnerAllocs...>& other) (const scoped_allocator_adaptor_base<OuterA2, InnerAllocs...>& other)
: outer_allocator_type(other.outer_allocator()) : outer_allocator_type(other.outer_allocator())
, inner(other.inner_allocator()) , m_inner(other.inner_allocator())
{} {}
template <class OuterA2> template <class OuterA2>
@@ -671,7 +671,7 @@ class scoped_allocator_adaptor_base
(BOOST_RV_REF_BEG scoped_allocator_adaptor_base (BOOST_RV_REF_BEG scoped_allocator_adaptor_base
<OuterA2, InnerAllocs...> BOOST_RV_REF_END other) <OuterA2, InnerAllocs...> BOOST_RV_REF_END other)
: outer_allocator_type(other.outer_allocator()) : outer_allocator_type(other.outer_allocator())
, inner(other.inner_allocator()) , m_inner(other.inner_allocator())
{} {}
protected: protected:
@@ -692,22 +692,22 @@ class scoped_allocator_adaptor_base
(BOOST_COPY_ASSIGN_REF(scoped_allocator_adaptor_base) other) (BOOST_COPY_ASSIGN_REF(scoped_allocator_adaptor_base) other)
{ {
outer_allocator_type::operator=(other.outer_allocator()); outer_allocator_type::operator=(other.outer_allocator());
inner = other.inner_allocator(); m_inner = other.inner_allocator();
return *this; return *this;
} }
scoped_allocator_adaptor_base &operator=(BOOST_RV_REF(scoped_allocator_adaptor_base) other) scoped_allocator_adaptor_base &operator=(BOOST_RV_REF(scoped_allocator_adaptor_base) other)
{ {
outer_allocator_type::operator=(boost::move(other.outer_allocator())); outer_allocator_type::operator=(boost::move(other.outer_allocator()));
inner = ::boost::move(other.inner_allocator()); m_inner = ::boost::move(other.inner_allocator());
return *this; return *this;
} }
inner_allocator_type& inner_allocator() inner_allocator_type& inner_allocator()
{ return inner; } { return m_inner; }
inner_allocator_type const& inner_allocator() const inner_allocator_type const& inner_allocator() const
{ return inner; } { return m_inner; }
outer_allocator_type & outer_allocator() outer_allocator_type & outer_allocator()
{ return static_cast<outer_allocator_type&>(*this); } { return static_cast<outer_allocator_type&>(*this); }
@@ -716,7 +716,7 @@ class scoped_allocator_adaptor_base
{ return static_cast<const outer_allocator_type&>(*this); } { return static_cast<const outer_allocator_type&>(*this); }
private: private:
inner_allocator_type inner; inner_allocator_type m_inner;
}; };
#else //#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #else //#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
@@ -1060,6 +1060,7 @@ class scoped_allocator_adaptor
, true BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_CONTAINER_MAX_CONSTRUCTOR_PARAMETERS, Q) , true BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_CONTAINER_MAX_CONSTRUCTOR_PARAMETERS, Q)
#endif #endif
> base_type; > base_type;
typedef typename base_type::internal_type_t internal_type_t;
/// @endcond /// @endcond
typedef OuterAlloc outer_allocator_type; typedef OuterAlloc outer_allocator_type;
//! Type: For exposition only //! Type: For exposition only