Advertisement
VlaoMao

Untitled

May 13th, 2014
529
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.02 KB | None | 0 0
  1. ┌─[16:05][vl]:[~/iterators_boost]
  2. └─$ svn info
  3. Path: .
  4. Working Copy Root Path: /home/vl/iterators_boost
  5. URL: http://svn.boost.org/svn/boost/trunk/boost/archive/iterators
  6. Relative URL: ^/trunk/boost/archive/iterators
  7. Repository Root: http://svn.boost.org/svn/boost
  8. Repository UUID: b8fc166d-592f-0410-95f2-cb63ce0dd405
  9. Revision: 86799
  10. Node Kind: directory
  11. Schedule: normal
  12. Last Changed Author: ramey
  13. Last Changed Rev: 86155
  14. Last Changed Date: 2013-10-04 04:26:49 +0400 (Пт, 04 окт 2013)
  15.  
  16. ┌─[16:05][vl]:[~/iterators_boost]
  17. └─$ svn diff -r 85952 transform_width.hpp
  18. Index: transform_width.hpp
  19. ===================================================================
  20. --- transform_width.hpp (revision 85952)
  21. +++ transform_width.hpp (working copy)
  22. @@ -24,6 +24,7 @@
  23.  // character and 8 bit bytes. Lowest common multiple is 24 => 4 6 bit characters
  24.  // or 3 8 bit characters
  25.  
  26. +
  27.  #include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME & PTFO
  28.  #include <boost/serialization/pfto.hpp>
  29.  
  30. @@ -30,6 +31,8 @@
  31.  #include <boost/iterator/iterator_adaptor.hpp>
  32.  #include <boost/iterator/iterator_traits.hpp>
  33.  
  34. +#include <algorithm> // std::min
  35. +
  36.  namespace boost {
  37.  namespace archive {
  38.  namespace iterators {
  39. @@ -112,6 +115,10 @@
  40.      transform_width(BOOST_PFTO_WRAPPER(T) start) :
  41.          super_t(Base(BOOST_MAKE_PFTO_WRAPPER(static_cast< T >(start)))),
  42.          m_buffer_out_full(false),
  43. +        // To disable GCC warning, but not truly necessary
  44. +           //(m_buffer_in will be initialized later before being
  45. +           //used because m_remaining_bits == 0)
  46. +        m_buffer_in(0),
  47.          m_remaining_bits(0),
  48.          m_end_of_sequence(false)
  49.      {}
  50. @@ -119,8 +126,8 @@
  51.      transform_width(const transform_width & rhs) :
  52.          super_t(rhs.base_reference()),
  53.          m_buffer_out_full(rhs.m_buffer_out_full),
  54. +        m_buffer_in(rhs.m_buffer_in),
  55.          m_remaining_bits(rhs.m_remaining_bits),
  56. -        m_buffer_in(rhs.m_buffer_in),
  57.          m_end_of_sequence(false)
  58.      {}
  59.  };
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement