[Boost-commit] svn:boost r42077 - in branches/release/boost: format io

From: john_at_[hidden]
Date: 2007-12-15 12:44:30

Author: johnmaddock
Date: 2007-12-15 12:44:30 EST (Sat, 15 Dec 2007)
New Revision: 42077
URL: http://svn.boost.org/trac/boost/changeset/42077

Log:
Merge some trivial MSVC warning fixes from Trunk.
Text files modified: 
   branches/release/boost/format/feed_args.hpp             |     2 +-                                      
   branches/release/boost/format/format_implementation.hpp |     2 +-                                      
   branches/release/boost/format/group.hpp                 |     2 ++                                      
   branches/release/boost/io/ios_state.hpp                 |    13 +++++++++++++                           
   4 files changed, 17 insertions(+), 2 deletions(-)

Modified: branches/release/boost/format/feed_args.hpp
==============================================================================
--- branches/release/boost/format/feed_args.hpp	(original)
+++ branches/release/boost/format/feed_args.hpp	2007-12-15 12:44:30 EST (Sat, 15 Dec 2007)
@@ -218,7 +218,7 @@
                 }
                 else { // hum..  we need to pad (multi_output, or spacepad present)
                     //find where we should pad
-                    size_type sz = (std::min)(res_size+prefix_space, tmp_size);
+                    size_type sz = (std::min)(res_size + (prefix_space ? 1 : 0), tmp_size);
                     size_type i = prefix_space;
                     for(; i<sz && tmp_beg[i] == res[i-prefix_space]; ++i) {}
                     if(i>=tmp_size) i=prefix_space;

Modified: branches/release/boost/format/format_implementation.hpp
==============================================================================
--- branches/release/boost/format/format_implementation.hpp	(original)
+++ branches/release/boost/format/format_implementation.hpp	2007-12-15 12:44:30 EST (Sat, 15 Dec 2007)
@@ -272,7 +272,7 @@
         // this is a permanent change, clear or reset won't cancel that.
         if(itemN<1 || itemN > static_cast<signed int>(self.items_.size() )) {
             if( self.exceptions() & io::out_of_range_bit ) 
-                boost::throw_exception(io::out_of_range(itemN, 1, self.items_.size() ));
+                boost::throw_exception(io::out_of_range(itemN, 1, static_cast<int>(self.items_.size()) ));
             else return self;
         }
         self.items_[itemN-1].fmtstate_. template apply_manip<T> ( manipulator );

Modified: branches/release/boost/format/group.hpp
==============================================================================
--- branches/release/boost/format/group.hpp	(original)
+++ branches/release/boost/format/group.hpp	2007-12-15 12:44:30 EST (Sat, 15 Dec 2007)
@@ -127,6 +127,8 @@
     group4(T1 a1,T2 a2,T3 a3,T4 a4)
       : a1_(a1),a2_(a2),a3_(a3),a4_(a4)
       {}
+private:
+   group4& operator=(const group4&);
 };
 
 template <class Ch, class Tr, class T1,class T2,class T3,class T4>

Modified: branches/release/boost/io/ios_state.hpp
==============================================================================
--- branches/release/boost/io/ios_state.hpp	(original)
+++ branches/release/boost/io/ios_state.hpp	2007-12-15 12:44:30 EST (Sat, 15 Dec 2007)
@@ -50,6 +50,8 @@
 private:
     state_type &       s_save_;
     aspect_type const  a_save_;
+
+    ios_flags_saver& operator=(const ios_flags_saver&);
 };
 
 class ios_precision_saver
@@ -73,6 +75,8 @@
 private:
     state_type &       s_save_;
     aspect_type const  a_save_;
+
+    ios_precision_saver& operator=(const ios_precision_saver&);
 };
 
 class ios_width_saver
@@ -96,6 +100,7 @@
 private:
     state_type &       s_save_;
     aspect_type const  a_save_;
+    ios_width_saver& operator=(const ios_width_saver&);
 };
 
 
@@ -277,6 +282,8 @@
     state_type &       s_save_;
     aspect_type const  a_save_;
     index_type const   i_save_;
+
+    ios_iword_saver& operator=(const ios_iword_saver&);
 };
 
 class ios_pword_saver
@@ -302,6 +309,8 @@
     state_type &       s_save_;
     aspect_type const  a_save_;
     index_type const   i_save_;
+
+    ios_pword_saver operator=(const ios_pword_saver&);
 };
 
 
@@ -332,6 +341,8 @@
     state_type::fmtflags const  a1_save_;
     ::std::streamsize const     a2_save_;
     ::std::streamsize const     a3_save_;
+
+    ios_base_all_saver& operator=(const ios_base_all_saver&);
 };
 
 template < typename Ch, class Tr >
@@ -408,6 +419,8 @@
     index_type const  i_save_;
     long const        a1_save_;
     void * const      a2_save_;
+
+    ios_all_word_saver& operator=(const ios_all_word_saver&);
 };