strstream.cc, [...]: Remove incorrect whitespace added in my previous change.

* src/strstream.cc, include/bits/basic_string.tcc: Remove
incorrect whitespace added in my previous change.

From-SVN: r63869

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bfaa812ba50060a40ecae34e87f07b104c86b30a..ef9b41f0cd5f2dda7adb17f07d56378c1e49ea75 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-04  Alexandre Oliva  <aoliva@redhat.com>
+
+       * src/strstream.cc, include/bits/basic_string.tcc: Remove
+       incorrect whitespace added in my previous change.
+
 2003-03-05  Carlo Wood  <carlo@alinoe.com>
 
         * include/bits/ios_base.h(ios_base::Init::_S_initialized()): Added

diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc
index 78f889ce0e8cdbd383879f3e1ee34f74feaa01fc..b7034adadeb1db9ab1aff95e6500867cbc76faed 100644 (file)
--- a/libstdc++-v3/include/bits/basic_string.tcc
+++ b/libstdc++-v3/include/bits/basic_string.tcc
@@ -578,7 +578,7 @@ namespace std
       // Iff appending itself, string needs to pre-reserve the
       // correct size so that _M_mutate does not clobber the
       // iterators formed here.
-      size_type __len = std::min(size_type (__str.size() - __pos),
+      size_type __len = std::min(size_type(__str.size() - __pos),
                                 __n) + this->size();
       if (__len > this->capacity())
        this->reserve(__len);
@@ -710,7 +710,7 @@ namespace std
       size_type __size = this->size();
       if (__n <= __size)
        {
-         __pos = std::min(size_type (__size - __n), __pos);
+         __pos = std::min(size_type(__size - __n), __pos);
          const _CharT* __data = _M_data();
          do 
            {
@@ -849,7 +849,7 @@ namespace std
       if (__pos > __size)
        __throw_out_of_range("basic_string::compare");
       
-      size_type __rsize= std::min(size_type (__size - __pos), __n);
+      size_type __rsize= std::min(size_type(__size - __pos), __n);
       size_type __len = std::min(__rsize, __osize);
       int __r = traits_type::compare(_M_data() + __pos, __str.data(), __len);
       if (!__r)
@@ -868,8 +868,8 @@ namespace std
       if (__pos1 > __size || __pos2 > __osize)
        __throw_out_of_range("basic_string::compare");
       
-      size_type __rsize = std::min(size_type (__size - __pos1), __n1);
-      size_type __rosize = std::min(size_type (__osize - __pos2), __n2);
+      size_type __rsize = std::min(size_type(__size - __pos1), __n1);
+      size_type __rosize = std::min(size_type(__osize - __pos2), __n2);
       size_type __len = std::min(__rsize, __rosize);
       int __r = traits_type::compare(_M_data() + __pos1, 
                                     __str.data() + __pos2, __len);
@@ -904,7 +904,7 @@ namespace std
        __throw_out_of_range("basic_string::compare");
       
       size_type __osize = traits_type::length(__s);
-      size_type __rsize = std::min(size_type (__size - __pos), __n1);
+      size_type __rsize = std::min(size_type(__size - __pos), __n1);
       size_type __len = std::min(__rsize, __osize);
       int __r = traits_type::compare(_M_data() + __pos, __s, __len);
       if (!__r)
@@ -923,7 +923,7 @@ namespace std
        __throw_out_of_range("basic_string::compare");
       
       size_type __osize = std::min(traits_type::length(__s), __n2);
-      size_type __rsize = std::min(size_type (__size - __pos), __n1);
+      size_type __rsize = std::min(size_type(__size - __pos), __n1);
       size_type __len = std::min(__rsize, __osize);
       int __r = traits_type::compare(_M_data() + __pos, __s, __len);
       if (!__r)

diff --git a/libstdc++-v3/src/strstream.cc b/libstdc++-v3/src/strstream.cc
index a030697f68d218e8995fa5c839066a2c3946e9e4..3bec69855f2f15d95ad9a915a8b413b54d034067 100644 (file)
--- a/libstdc++-v3/src/strstream.cc
+++ b/libstdc++-v3/src/strstream.cc
@@ -148,7 +148,7 @@ namespace std
     if (pptr() == epptr() && _M_dynamic && !_M_frozen && !_M_constant) 
       {
        ptrdiff_t old_size = epptr() - pbase();
-       ptrdiff_t new_size = std::max(ptrdiff_t (2 * old_size), ptrdiff_t (1));
+       ptrdiff_t new_size = std::max(ptrdiff_t(2 * old_size), ptrdiff_t(1));
        
        char* buf = _M_alloc(new_size);
        if (buf)