Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r56022 - in trunk: boost/iostreams boost/iostreams/detail boost/iostreams/detail/streambuf boost/iostreams/filter libs/iostreams/test/detail
From: bdawes_at_[hidden]
Date: 2009-09-04 18:20:42


Author: bemandawes
Date: 2009-09-04 18:20:40 EDT (Fri, 04 Sep 2009)
New Revision: 56022
URL: http://svn.boost.org/trac/boost/changeset/56022

Log:
Quiet GCC warnings
Text files modified:
   trunk/boost/iostreams/detail/restrict_impl.hpp | 6 +++---
   trunk/boost/iostreams/detail/streambuf/direct_streambuf.hpp | 2 +-
   trunk/boost/iostreams/detail/streambuf/indirect_streambuf.hpp | 4 ++--
   trunk/boost/iostreams/filter/symmetric.hpp | 2 +-
   trunk/boost/iostreams/skip.hpp | 4 ++--
   trunk/libs/iostreams/test/detail/operation_sequence.hpp | 4 ++--
   6 files changed, 11 insertions(+), 11 deletions(-)

Modified: trunk/boost/iostreams/detail/restrict_impl.hpp
==============================================================================
--- trunk/boost/iostreams/detail/restrict_impl.hpp (original)
+++ trunk/boost/iostreams/detail/restrict_impl.hpp 2009-09-04 18:20:40 EDT (Fri, 04 Sep 2009)
@@ -184,7 +184,7 @@
                 bad_seek();
             return offset_to_position(pos_ - beg_);
         }
- if (next < beg_ || end_ != -1 && next >= end_)
+ if (next < beg_ || (end_ != -1 && next >= end_))
             bad_seek();
         pos_ = this->component().seek(dev, next, BOOST_IOS::cur);
         return offset_to_position(pos_ - beg_);
@@ -296,7 +296,7 @@
             bad_seek();
         return offset_to_position(pos_ - beg_);
     }
- if (next < beg_ || end_ != -1 && next >= end_)
+ if (next < beg_ || (end_ != -1 && next >= end_))
         bad_seek();
     pos_ = iostreams::seek(this->component(), next - pos_, BOOST_IOS::cur);
     return offset_to_position(pos_ - beg_);
@@ -312,7 +312,7 @@
     std::pair<char_type*, char_type*> seq =
         sequence(is_convertible<category, input>());
     if ( off < 0 || len < -1 ||
- len != -1 && off + len > seq.second - seq.first )
+ (len != -1 && off + len > seq.second - seq.first) )
     {
         throw BOOST_IOSTREAMS_FAILURE("bad offset");
     }

Modified: trunk/boost/iostreams/detail/streambuf/direct_streambuf.hpp
==============================================================================
--- trunk/boost/iostreams/detail/streambuf/direct_streambuf.hpp (original)
+++ trunk/boost/iostreams/detail/streambuf/direct_streambuf.hpp 2009-09-04 18:20:40 EDT (Fri, 04 Sep 2009)
@@ -220,7 +220,7 @@
     bool one = one_head();
     if (one && (pptr() != 0 || gptr()== 0))
         init_get_area(); // Switch to input mode, for code reuse.
- if (one || (which & BOOST_IOS::in) != 0 && ibeg_ != 0) {
+ if (one || ((which & BOOST_IOS::in) != 0 && ibeg_ != 0)) {
         if (!gptr()) setg(ibeg_, ibeg_, iend_);
         ptrdiff_t next = 0;
         switch (way) {

Modified: trunk/boost/iostreams/detail/streambuf/indirect_streambuf.hpp
==============================================================================
--- trunk/boost/iostreams/detail/streambuf/indirect_streambuf.hpp (original)
+++ trunk/boost/iostreams/detail/streambuf/indirect_streambuf.hpp 2009-09-04 18:20:40 EDT (Fri, 04 Sep 2009)
@@ -282,8 +282,8 @@
 typename indirect_streambuf<T, Tr, Alloc, Mode>::int_type
 indirect_streambuf<T, Tr, Alloc, Mode>::overflow(int_type c)
 {
- if ( output_buffered() && pptr() == 0 ||
- shared_buffer() && gptr() != 0 )
+ if ( (output_buffered() && pptr() == 0) ||
+ (shared_buffer() && gptr() != 0) )
     {
         init_put_area();
     }

Modified: trunk/boost/iostreams/filter/symmetric.hpp
==============================================================================
--- trunk/boost/iostreams/filter/symmetric.hpp (original)
+++ trunk/boost/iostreams/filter/symmetric.hpp 2009-09-04 18:20:40 EDT (Fri, 04 Sep 2009)
@@ -124,7 +124,7 @@
 
             // If no more characters are available without blocking, or
             // if read request has been satisfied, return.
- if ( status == f_would_block && buf.ptr() == buf.eptr() ||
+ if ( (status == f_would_block && buf.ptr() == buf.eptr()) ||
                  next_s == end_s )
             {
                 return static_cast<std::streamsize>(next_s - s);

Modified: trunk/boost/iostreams/skip.hpp
==============================================================================
--- trunk/boost/iostreams/skip.hpp (original)
+++ trunk/boost/iostreams/skip.hpp 2009-09-04 18:20:40 EDT (Fri, 04 Sep 2009)
@@ -100,8 +100,8 @@
> can_seek;
     BOOST_STATIC_ASSERT(
         ( can_seek::value ||
- is_convertible<filter_mode, input>::value &&
- is_convertible<device_mode, input>::value )
+ (is_convertible<filter_mode, input>::value &&
+ is_convertible<device_mode, input>::value) )
     );
     detail::skip(flt, dev, off, which, can_seek());
 }

Modified: trunk/libs/iostreams/test/detail/operation_sequence.hpp
==============================================================================
--- trunk/libs/iostreams/test/detail/operation_sequence.hpp (original)
+++ trunk/libs/iostreams/test/detail/operation_sequence.hpp 2009-09-04 18:20:40 EDT (Fri, 04 Sep 2009)
@@ -150,8 +150,8 @@
 {
     using namespace std;
     if ( error_code < 0 ||
- error_code > BOOST_IOSTREAMS_TEST_MAX_OPERATION_ERROR &&
- error_code != INT_MAX )
+ (error_code > BOOST_IOSTREAMS_TEST_MAX_OPERATION_ERROR &&
+ error_code != INT_MAX) )
     {
         throw runtime_error( string("The error code ") +
                              lexical_cast<string>(error_code) +


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