Boost logo

Boost-Commit :

Date view Thread view Subject view Author view

Subject: [Boost-commit] svn:boost r82641 - in sandbox/varray: boost/container boost/container/detail doc/generated doc/html doc/html/varray
From: adam.wulkiewicz_at_[hidden]
Date: 2013-01-27 13:28:24

Author: awulkiew
Date: 2013-01-27 13:28:23 EST (Sun, 27 Jan 2013)
New Revision: 82641
URL: http://svn.boost.org/trac/boost/changeset/82641

Log:
varray::shrink_to_fit() removed.
swap() moved to boost namespace.
Text files modified:
   sandbox/varray/boost/container/detail/varray.hpp | 23 +++++++++--------------
   sandbox/varray/boost/container/varray.hpp | 16 ++++++++++++----
   sandbox/varray/doc/generated/varray_non_member.qbk | 14 +++++++-------
   sandbox/varray/doc/html/index.html | 2 +-
   sandbox/varray/doc/html/varray/reference.html | 34 +++++++++++++++++-----------------
   5 files changed, 46 insertions(+), 43 deletions(-)

Modified: sandbox/varray/boost/container/detail/varray.hpp
==============================================================================
--- sandbox/varray/boost/container/detail/varray.hpp (original)
+++ sandbox/varray/boost/container/detail/varray.hpp 2013-01-27 13:28:23 EST (Sun, 27 Jan 2013)
@@ -984,14 +984,14 @@
         {
             namespace sv = varray_detail;
 
- std::fill_n(this->begin(), count, value);
+ std::fill_n(this->begin(), count, value); // may throw
             sv::destroy(this->begin() + count, this->end());
         }
         else
         {
             errh::check_capacity(*this, count); // may throw
 
- std::fill_n(this->begin(), m_size, value);
+ std::fill_n(this->begin(), m_size, value); // may throw
             std::uninitialized_fill(this->end(), this->begin() + count, value); // may throw
         }
         m_size = count; // update end
@@ -1508,15 +1508,6 @@
     //! Constant O(1).
     bool empty() const { return 0 == m_size; }
 
- //! @brief Capacity is fixed so this call has no effects.
- //!
- //! @par Throws
- //! Nothing.
- //!
- //! @par Complexity
- //! Constant O(1).
- void shrink_to_fit() {}
-
 private:
 
     // @par Throws
@@ -2123,7 +2114,6 @@
     size_type max_size() const { return 0; }
     size_type size() const { return 0; }
     bool empty() const { return true; }
- void shrink_to_fit() {}
 
 private:
 
@@ -2242,6 +2232,10 @@
     return !(x<y);
 }
 
+}}} // namespace boost::container::container_detail
+
+namespace boost {
+
 //! @brief Swaps contents of two varrays.
 //!
 //! This function calls varray::swap().
@@ -2254,12 +2248,13 @@
 //! @par Complexity
 //! Linear O(N).
 template<typename V, std::size_t C1, typename S1, std::size_t C2, typename S2>
-inline void swap(varray<V, C1, S1> & x, varray<V, C2, S2> & y)
+inline void swap(container::container_detail::varray<V, C1, S1> & x,
+ container::container_detail::varray<V, C2, S2> & y)
 {
     x.swap(y);
 }
 
-}}} // namespace boost::container::container_detail
+} // namespace boost
 
 #include <boost/container/detail/config_end.hpp>
 

Modified: sandbox/varray/boost/container/varray.hpp
==============================================================================
--- sandbox/varray/boost/container/varray.hpp (original)
+++ sandbox/varray/boost/container/varray.hpp 2013-01-27 13:28:23 EST (Sun, 27 Jan 2013)
@@ -971,6 +971,12 @@
 template<typename V, std::size_t C1, std::size_t C2>
 bool operator>= (varray<V, C1> const& x, varray<V, C2> const& y);
 
+#endif // BOOST_CONTAINER_DOXYGEN_INVOKED
+
+}} // namespace boost::container
+
+namespace boost {
+
 //! @brief Swaps contents of two varrays.
 //!
 //! This function calls varray::swap().
@@ -983,11 +989,13 @@
 //! @par Complexity
 //! Linear O(N).
 template<typename V, std::size_t C1, std::size_t C2>
-inline void swap(varray<V, C1> & x, varray<V, C2> & y);
-
-#endif // BOOST_CONTAINER_DOXYGEN_INVOKED
+inline void swap(container::varray<V, C1> & x,
+ container::varray<V, C2> & y)
+{
+ x.swap(y);
+}
 
-}} // namespace boost::container
+} // namespace boost
 
 #include <boost/container/detail/config_end.hpp>
 

Modified: sandbox/varray/doc/generated/varray_non_member.qbk
==============================================================================
--- sandbox/varray/doc/generated/varray_non_member.qbk (original)
+++ sandbox/varray/doc/generated/varray_non_member.qbk 2013-01-27 13:28:23 EST (Sun, 27 Jan 2013)
@@ -10,7 +10,7 @@
 [[[link group__varray__non__member_1ga10d2ce7ca29d0665a59cb96215b49440 `operator>(varray<...> const &, varray<...> const &)`]][Lexicographically compares varrays. ]]
 [[[link group__varray__non__member_1ga9dc9344081e4f2e6636cfe6080e06c56 `operator<=(varray<...> const &, varray<...> const &)`]][Lexicographically compares varrays. ]]
 [[[link group__varray__non__member_1ga421e358bc22b19e49fd63fb462c35c5d `operator>=(varray<...> const &, varray<...> const &)`]][Lexicographically compares varrays. ]]
-[[[link group__varray__non__member_1gac4af1128111dd5e63afc195f8b3e0ec4 `swap(varray<...> &, varray<...> &)`]][Swaps contents of two varrays. ]]
+[[[link group__varray__non__member_1ga2145a9f7be85a7a4e3919d2ce2eb0de9 `swap(container::varray<...> &, container::varray<...> &)`]][Swaps contents of two varrays. ]]
 ]
 
 [#group__varray__non__member_1gaba927647f8414bfa8109140f6b9d5a9c]
@@ -163,24 +163,24 @@
 
 [endsect]
 
-[#group__varray__non__member_1gac4af1128111dd5e63afc195f8b3e0ec4]
-[section swap(varray<...> &, varray<...> &)]
+[#group__varray__non__member_1ga2145a9f7be85a7a4e3919d2ce2eb0de9]
+[section swap(container::varray<...> &, container::varray<...> &)]
 Swaps contents of two varrays.
 
 [heading Description]
-This function calls [link classboost_1_1container_1_1varray_1a002fb09972d8a2f11673265d0d06a100 varray::swap()].[heading Synopsis]
+This function calls [link group__varray__non__member_1ga2145a9f7be85a7a4e3919d2ce2eb0de9 varray::swap()].[heading Synopsis]
 [pre
 `template<``typename V``,`
          `std::size_t C1``,`
          `std::size_t C2``>`
-`void boost::container::swap``(``varray< V, C1 > &` `x``,` `varray< V, C2 > &` `y``)`
+`void boost::swap``(``container::varray< V, C1 > &` `x``,` `container::varray< V, C2 > &` `y``)`
 ]
 
 [heading Parameter(s)]
 [table
 [[Type][Name][Description]]
-[[`varray< V, C1 > &`][ `x` ][The first varray. ]]
-[[`varray< V, C2 > &`][ `y` ][The second varray.]]
+[[`container::varray< V, C1 > &`][ `x` ][The first varray. ]]
+[[`container::varray< V, C2 > &`][ `y` ][The second varray.]]
 ]
 [heading Complexity]
 Linear O(N).

Modified: sandbox/varray/doc/html/index.html
==============================================================================
--- sandbox/varray/doc/html/index.html (original)
+++ sandbox/varray/doc/html/index.html 2013-01-27 13:28:23 EST (Sun, 27 Jan 2013)
@@ -51,7 +51,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: January 27, 2013 at 18:12:44 GMT</small></p></td>
+<td align="left"><p><small>Last revised: January 27, 2013 at 18:27:28 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>

Modified: sandbox/varray/doc/html/varray/reference.html
==============================================================================
--- sandbox/varray/doc/html/varray/reference.html (original)
+++ sandbox/varray/doc/html/varray/reference.html 2013-01-27 13:28:23 EST (Sun, 27 Jan 2013)
@@ -35,7 +35,7 @@
 <a name="staticvector.reference.boost_container_varray"></a><a name="classboost_1_1container_1_1varray"></a><a class="link" href="reference.html#staticvector.reference.boost_container_varray" title="boost::container::varray">boost::container::varray</a>
 </h3></div></div></div>
 <p>
- <a class="indexterm" name="id896846"></a><a class="indexterm" name="id896851"></a><a class="indexterm" name="id896856"></a>
+ <a class="indexterm" name="id888108"></a><a class="indexterm" name="id888113"></a><a class="indexterm" name="id888118"></a>
 A variable-size array container with fixed capacity.
       </p>
 <h5>
@@ -5440,8 +5440,8 @@
 <tr>
 <td>
                 <p>
- <a class="link" href="reference.html#group__varray__non__member_1gac4af1128111dd5e63afc195f8b3e0ec4"><code class="computeroutput"><span class="identifier">swap</span><span class="special">(</span><span class="identifier">varray</span><span class="special">&lt;...&gt;</span>
- <span class="special">&amp;,</span> <span class="identifier">varray</span><span class="special">&lt;...&gt;</span> <span class="special">&amp;)</span></code></a>
+ <a class="link" href="reference.html#group__varray__non__member_1ga2145a9f7be85a7a4e3919d2ce2eb0de9"><code class="computeroutput"><span class="identifier">swap</span><span class="special">(</span><span class="identifier">container</span><span class="special">::</span><span class="identifier">varray</span><span class="special">&lt;...&gt;</span>
+ <span class="special">&amp;,</span> <span class="identifier">container</span><span class="special">::</span><span class="identifier">varray</span><span class="special">&lt;...&gt;</span> <span class="special">&amp;)</span></code></a>
                 </p>
               </td>
 <td>
@@ -6072,31 +6072,31 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="staticvector.reference.group__varray__non__member.swap_varray_________varray________"></a><a name="group__varray__non__member_1gac4af1128111dd5e63afc195f8b3e0ec4"></a><a class="link" href="reference.html#staticvector.reference.group__varray__non__member.swap_varray_________varray________" title="swap(varray&lt;...&gt; &amp;, varray&lt;...&gt; &amp;)">swap(varray&lt;...&gt;
- &amp;, varray&lt;...&gt; &amp;)</a>
+<a name="staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________"></a><a name="group__varray__non__member_1ga2145a9f7be85a7a4e3919d2ce2eb0de9"></a><a class="link" href="reference.html#staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________" title="swap(container::varray&lt;...&gt; &amp;, container::varray&lt;...&gt; &amp;)">swap(container::varray&lt;...&gt;
+ &amp;, container::varray&lt;...&gt; &amp;)</a>
 </h4></div></div></div>
 <p>
           Swaps contents of two varrays.
         </p>
 <h6>
-<a name="staticvector.reference.group__varray__non__member.swap_varray_________varray________.h0"></a>
- <span class="phrase"><a name="staticvector.reference.group__varray__non__member.swap_varray_________varray________.description"></a></span><a class="link" href="reference.html#staticvector.reference.group__varray__non__member.swap_varray_________varray________.description">Description</a>
+<a name="staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________.h0"></a>
+ <span class="phrase"><a name="staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________.description"></a></span><a class="link" href="reference.html#staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________.description">Description</a>
         </h6>
 <p>
- This function calls <a class="link" href="reference.html#classboost_1_1container_1_1varray_1a002fb09972d8a2f11673265d0d06a100">varray::swap()</a>.
+ This function calls <a class="link" href="reference.html#group__varray__non__member_1ga2145a9f7be85a7a4e3919d2ce2eb0de9">varray::swap()</a>.
         </p>
 <h6>
-<a name="staticvector.reference.group__varray__non__member.swap_varray_________varray________.h1"></a>
- <span class="phrase"><a name="staticvector.reference.group__varray__non__member.swap_varray_________varray________.synopsis"></a></span><a class="link" href="reference.html#staticvector.reference.group__varray__non__member.swap_varray_________varray________.synopsis">Synopsis</a>
+<a name="staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________.h1"></a>
+ <span class="phrase"><a name="staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________.synopsis"></a></span><a class="link" href="reference.html#staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________.synopsis">Synopsis</a>
         </h6>
 <pre class="programlisting"><code class="computeroutput"><span class="keyword">template</span><span class="special">&lt;</span></code><code class="computeroutput"><span class="keyword">typename</span> <span class="identifier">V</span></code><code class="computeroutput"><span class="special">,</span></code>
          <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">C1</span></code><code class="computeroutput"><span class="special">,</span></code>
          <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">C2</span></code><code class="computeroutput"><span class="special">&gt;</span></code>
-<code class="computeroutput"><span class="keyword">void</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">container</span><span class="special">::</span><span class="identifier">swap</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">varray</span><span class="special">&lt;</span> <span class="identifier">V</span><span class="special">,</span> <span class="identifier">C1</span> <span class="special">&gt;</span> <span class="special">&amp;</span></code> <code class="computeroutput"><span class="identifier">x</span></code><code class="computeroutput"><span class="special">,</span></code> <code class="computeroutput"><span class="identifier">varray</span><span class="special">&lt;</span> <span class="identifier">V</span><span class="special">,</span> <span class="identifier">C2</span> <span class="special">&gt;</span> <span class="special">&amp;</span></code> <code class="computero
utput"><span class="identifier">y</span></code><code class="computeroutput"><span class="special">)</span></code>
+<code class="computeroutput"><span class="keyword">void</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">swap</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">container</span><span class="special">::</span><span class="identifier">varray</span><span class="special">&lt;</span> <span class="identifier">V</span><span class="special">,</span> <span class="identifier">C1</span> <span class="special">&gt;</span> <span class="special">&amp;</span></code> <code class="computeroutput"><span class="identifier">x</span></code><code class="computeroutput"><span class="special">,</span></code> <code class="computeroutput"><span class="identifier">container</span><span class="special">::</span><span class="identifier">varray</span><span class="special">&lt;</span> <span class="identifier">V</span><span class="special">,</span> <span class="identifier">C2</span> <span class="special">&gt;
</span> <span class="special">&amp;</span></code> <code class="computeroutput"><span class="identifier">y</span></code><code class="computeroutput"><span class="special">)</span></code>
 </pre>
 <h6>
-<a name="staticvector.reference.group__varray__non__member.swap_varray_________varray________.h2"></a>
- <span class="phrase"><a name="staticvector.reference.group__varray__non__member.swap_varray_________varray________.parameter_s_"></a></span><a class="link" href="reference.html#staticvector.reference.group__varray__non__member.swap_varray_________varray________.parameter_s_">Parameter(s)</a>
+<a name="staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________.h2"></a>
+ <span class="phrase"><a name="staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________.parameter_s_"></a></span><a class="link" href="reference.html#staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________.parameter_s_">Parameter(s)</a>
         </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -6125,7 +6125,7 @@
 <tr>
 <td>
                   <p>
- <code class="computeroutput"><span class="identifier">varray</span><span class="special">&lt;</span>
+ <code class="computeroutput"><span class="identifier">container</span><span class="special">::</span><span class="identifier">varray</span><span class="special">&lt;</span>
                     <span class="identifier">V</span><span class="special">,</span>
                     <span class="identifier">C1</span> <span class="special">&gt;</span>
                     <span class="special">&amp;</span></code>
@@ -6145,7 +6145,7 @@
 <tr>
 <td>
                   <p>
- <code class="computeroutput"><span class="identifier">varray</span><span class="special">&lt;</span>
+ <code class="computeroutput"><span class="identifier">container</span><span class="special">::</span><span class="identifier">varray</span><span class="special">&lt;</span>
                     <span class="identifier">V</span><span class="special">,</span>
                     <span class="identifier">C2</span> <span class="special">&gt;</span>
                     <span class="special">&amp;</span></code>
@@ -6165,8 +6165,8 @@
 </tbody>
 </table></div>
 <h6>
-<a name="staticvector.reference.group__varray__non__member.swap_varray_________varray________.h3"></a>
- <span class="phrase"><a name="staticvector.reference.group__varray__non__member.swap_varray_________varray________.complexity"></a></span><a class="link" href="reference.html#staticvector.reference.group__varray__non__member.swap_varray_________varray________.complexity">Complexity</a>
+<a name="staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________.h3"></a>
+ <span class="phrase"><a name="staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________.complexity"></a></span><a class="link" href="reference.html#staticvector.reference.group__varray__non__member.swap_container__varray_________container__varray________.complexity">Complexity</a>
         </h6>
 <p>
           Linear O(N).

Date view Thread view Subject view Author view

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