|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r82123 - in sandbox/static_vector/boost/container: . detail
From: adam.wulkiewicz_at_[hidden]
Date: 2012-12-20 14:31:45
Author: awulkiew
Date: 2012-12-20 14:31:45 EST (Thu, 20 Dec 2012)
New Revision: 82123
URL: http://svn.boost.org/trac/boost/changeset/82123
Log:
namespace detail::static_vector changed to static_vector_detail to reflect Boost.Container standard.
Text files modified:
sandbox/static_vector/boost/container/detail/static_vector_util.hpp | 4 +-
sandbox/static_vector/boost/container/static_vector.hpp | 48 ++++++++++++++++++++--------------------
2 files changed, 26 insertions(+), 26 deletions(-)
Modified: sandbox/static_vector/boost/container/detail/static_vector_util.hpp
==============================================================================
--- sandbox/static_vector/boost/container/detail/static_vector_util.hpp (original)
+++ sandbox/static_vector/boost/container/detail/static_vector_util.hpp 2012-12-20 14:31:45 EST (Thu, 20 Dec 2012)
@@ -41,7 +41,7 @@
#include <vector>
#include <boost/container/vector.hpp>
-namespace boost { namespace container { namespace detail { namespace static_vector {
+namespace boost { namespace container { namespace static_vector_detail {
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
@@ -508,6 +508,6 @@
return count;
}
-}}}} // namespace boost::container::detail::static_vector
+}}} // namespace boost::container::static_vector_detail
#endif // BOOST_CONTAINER_DETAIL_STATIC_VECTOR_UTIL_HPP
Modified: sandbox/static_vector/boost/container/static_vector.hpp
==============================================================================
--- sandbox/static_vector/boost/container/static_vector.hpp (original)
+++ sandbox/static_vector/boost/container/static_vector.hpp 2012-12-20 14:31:45 EST (Thu, 20 Dec 2012)
@@ -40,7 +40,7 @@
template <typename Value, std::size_t Capacity, typename StoredSizeType>
class static_vector;
-namespace detail { namespace static_vector {
+namespace static_vector_detail {
struct error_handling
{
@@ -110,7 +110,7 @@
}
};
-}} // namespace detail::static_vector
+} // namespace static_vector_detail
template <typename Value, std::size_t Capacity, typename StoredSizeType = std::size_t>
class static_vector
@@ -127,7 +127,7 @@
boost::alignment_of<Value[Capacity]>::value
> aligned_storage_type;
- typedef detail::static_vector::error_handling errh;
+ typedef static_vector_detail::error_handling errh;
public:
typedef Value value_type;
@@ -165,7 +165,7 @@
static_vector(static_vector const& other)
: m_size(other.size())
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
sv::uninitialized_copy(other.begin(), other.end(), this->begin()); // may throw
}
@@ -176,7 +176,7 @@
{
errh::check_capacity(other.size()); // may throw
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
sv::uninitialized_copy(other.begin(), other.end(), this->begin()); // may throw
}
@@ -209,7 +209,7 @@
// nothrow
~static_vector()
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
sv::destroy(this->begin(), this->end());
}
@@ -217,7 +217,7 @@
// swap (note: linear complexity)
void swap(static_vector & other)
{
-// namespace sv = detail::static_vector;
+// namespace sv = static_vector_detail;
// iterator it = this->begin();
// iterator other_it = other.begin();
@@ -277,7 +277,7 @@
// strong
void resize(size_type count)
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
if ( count < m_size )
{
@@ -297,7 +297,7 @@
{
if ( count < m_size )
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
sv::destroy(this->begin() + count, this->end());
}
else
@@ -320,7 +320,7 @@
{
errh::check_capacity(*this, m_size + 1); // may throw
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
sv::uninitialized_fill(this->end(), value); // may throw
++m_size; // update end
}
@@ -331,11 +331,11 @@
errh::check_empty(*this);
//--m_size; // update end
- //namespace sv = detail::static_vector;
+ //namespace sv = static_vector_detail;
//sv::destroy(this->end());
// safer and more intuitive version
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
sv::destroy(this->end() - 1);
--m_size; // update end
}
@@ -343,7 +343,7 @@
// basic
iterator insert(iterator position, value_type const& value)
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
errh::check_iterator_end_eq(*this, position);
errh::check_capacity(*this, m_size + 1); // may throw
@@ -379,7 +379,7 @@
}
else
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
difference_type to_move = std::distance(position, this->end());
@@ -420,7 +420,7 @@
// basic
iterator erase(iterator position)
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
errh::check_iterator_end_neq(*this, position);
@@ -434,7 +434,7 @@
// basic
iterator erase(iterator first, iterator last)
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
errh::check_iterator_end_eq(*this, first);
errh::check_iterator_end_eq(*this, last);
@@ -464,7 +464,7 @@
{
if ( count < m_size )
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
std::fill_n(this->begin(), count, value);
sv::destroy(this->begin() + count, this->end());
@@ -482,7 +482,7 @@
// nothrow
void clear()
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
sv::destroy(this->begin(), this->end());
m_size = 0; // update end
}
@@ -585,7 +585,7 @@
if ( position == this->end() )
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
sv::uninitialized_copy(first, last, position); // may throw
m_size += count; // update end
@@ -603,7 +603,7 @@
if ( position == this->end() )
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
std::ptrdiff_t d = std::distance(position, this->begin() + Capacity);
std::size_t count = sv::uninitialized_copy_s(first, last, position, d); // may throw
@@ -626,7 +626,7 @@
template <typename Iterator>
void insert_in_the_middle(iterator position, Iterator first, Iterator last, difference_type count)
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
difference_type to_move = std::distance(position, this->end());
@@ -657,7 +657,7 @@
template <typename Iterator>
void assign_dispatch(Iterator first, Iterator last, boost::random_access_traversal_tag const& /*not_random_access*/)
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
typename boost::iterator_difference<Iterator>::type
s = std::distance(first, last);
@@ -681,7 +681,7 @@
template <typename Iterator, typename Traversal>
void assign_dispatch(Iterator first, Iterator last, Traversal const& /*not_random_access*/)
{
- namespace sv = detail::static_vector;
+ namespace sv = static_vector_detail;
size_type s = 0;
iterator it = this->begin();
@@ -719,7 +719,7 @@
template<typename Value, typename StoredSizeType>
class static_vector<Value, 0, StoredSizeType>
{
- typedef detail::static_vector::error_handling errh;
+ typedef static_vector_detail::error_handling errh;
public:
typedef Value value_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