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

Merge branch 'zerotypos-found-inspection_report' into develop

Browse Source
This commit is contained in:
Ion Gaztañaga
2017-01-12 14:53:35 +01:00
parent 79f5977688 f71fee5140
commit a5db65fc4a
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bench/bench_static_vector.cpp
View File

@@ -4,8 +4,8 @@
// @date Aug 14, 2011 // @date Aug 14, 2011
// @author Andrew Hundt <ATHundt@gmail.com> // @author Andrew Hundt <ATHundt@gmail.com>
// //
// (C) 2011-2013 Andrew Hundt <ATHundt@gmail.com> // (C) Copyright 2011-2013 Andrew Hundt <ATHundt@gmail.com>
// (C) 2013-2013 Ion Gaztanaga // (C) Copyright 2013-2013 Ion Gaztanaga
// //
// Distributed under the Boost Software License, Version 1.0. (See // Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at // accompanying file LICENSE_1_0.txt or copy at

4
include/boost/container/detail/advanced_insert_int.hpp
View File

@@ -107,8 +107,8 @@ struct insert_n_copies_proxy
void copy_n_and_update(Allocator &, Iterator p, size_type n) const void copy_n_and_update(Allocator &, Iterator p, size_type n) const
{ {
for (; 0 < n; --n, ++p){ for (; 0 < n; --n, ++p){
*p = v_; *p = v_;
} }
} }

6
include/boost/container/new_allocator.hpp
View File

@@ -140,9 +140,9 @@ class new_allocator
//!Throws std::bad_alloc if there is no enough memory //!Throws std::bad_alloc if there is no enough memory
pointer allocate(size_type count) pointer allocate(size_type count)
{ {
if(BOOST_UNLIKELY(count > this->max_size())) if(BOOST_UNLIKELY(count > this->max_size()))
throw_bad_alloc(); throw_bad_alloc();
return static_cast<T*>(::operator new(count*sizeof(T))); return static_cast<T*>(::operator new(count*sizeof(T)));
} }
//!Deallocates previously allocated memory. //!Deallocates previously allocated memory.

2
include/boost/container/small_vector.hpp
View File

@@ -507,7 +507,7 @@ class small_vector : public small_vector_base<T, Allocator>
public: public:
BOOST_CONTAINER_FORCEINLINE small_vector() BOOST_CONTAINER_FORCEINLINE small_vector()
BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible<Allocator>::value) BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible<Allocator>::value)
: base_type(initial_capacity_t(), internal_capacity()) : base_type(initial_capacity_t(), internal_capacity())
{} {}

8
test/map_test.cpp
View File

@@ -391,10 +391,10 @@ int main ()
//Test std::pair value type as tree has workarounds to make old std::pair //Test std::pair value type as tree has workarounds to make old std::pair
//implementations movable that can break things //implementations movable that can break things
{ {
boost::container::map<pair_t, pair_t> s; boost::container::map<pair_t, pair_t> s;
std::pair<const pair_t,pair_t> p; std::pair<const pair_t,pair_t> p;
s.insert(p); s.insert(p);
s.emplace(p); s.emplace(p);
} }
//////////////////////////////////// ////////////////////////////////////

8
test/set_test.cpp
View File

@@ -379,10 +379,10 @@ int main ()
//Test std::pair value type as tree has workarounds to make old std::pair //Test std::pair value type as tree has workarounds to make old std::pair
//implementations movable that can break things //implementations movable that can break things
{ {
boost::container::set<std::pair<int,int> > s; boost::container::set<std::pair<int,int> > s;
std::pair<int,int> p(0, 0); std::pair<int,int> p(0, 0);
s.insert(p); s.insert(p);
s.emplace(p); s.emplace(p);
} }
test_merge_from_different_comparison(); test_merge_from_different_comparison();