Hi,

On 05/24/2014 11:39 PM, Jonathan Wakely wrote:
On 24 May 2014 22:10, François Dumont wrote:
Done but I forgot to fix the spelling. I will fix it in the future patch.
No problem, it's clear what the comment means.
I'm committing the below.

Paolo.

/////////////////////
2014-05-25  Paolo Carlini  <paolo.carl...@oracle.com>

        * include/profile/map.h: Fix typo in comment; minor formatting fix.
        * include/profile/multimap.h: Likewise.
        * include/profile/set.h: Likewise.
        * include/profile/multiset.h: Likewise.
Index: include/profile/map.h
===================================================================
--- include/profile/map.h       (revision 210911)
+++ include/profile/map.h       (working copy)
@@ -451,15 +451,15 @@
        * operations have equivalent insertion cost so we do not update metrics
        * about it.
        * Note that to find out if hint has been used is libstdc++
-       * implementation dependant.
+       * implementation dependent.
        */
       bool
       _M_hint_used(const_iterator __hint, iterator __res)
       {
-       return (__hint == __res ||
-               (__hint == this->end() && ++__res == this->end()) ||
-               (__hint != this->end() && (++__hint == __res ||
-                                          ++__res == --__hint)));
+       return (__hint == __res
+               || (__hint == this->end() && ++__res == this->end())
+               || (__hint != this->end() && (++__hint == __res
+                                             || ++__res == --__hint)));
       }
     };
 
Index: include/profile/multimap.h
===================================================================
--- include/profile/multimap.h  (revision 210911)
+++ include/profile/multimap.h  (working copy)
@@ -419,15 +419,15 @@
        * operations have equivalent insertion cost so we do not update metrics
        * about it.
        * Note that to find out if hint has been used is libstdc++
-       * implementation dependant.
+       * implementation dependent.
        */
       bool
       _M_hint_used(const_iterator __hint, iterator __res)
       {
-       return (__hint == __res ||
-               (__hint == this->end() && ++__res == this->end()) ||
-               (__hint != this->end() && (++__hint == __res ||
-                                          ++__res == --__hint)));
+       return (__hint == __res
+               || (__hint == this->end() && ++__res == this->end())
+               || (__hint != this->end() && (++__hint == __res
+                                             || ++__res == --__hint)));
       }
     };
 
Index: include/profile/multiset.h
===================================================================
--- include/profile/multiset.h  (revision 210911)
+++ include/profile/multiset.h  (working copy)
@@ -413,15 +413,15 @@
        * operations have equivalent insertion cost so we do not update metrics
        * about it.
        * Note that to find out if hint has been used is libstdc++
-       * implementation dependant.
+       * implementation dependent.
        */
       bool
       _M_hint_used(const_iterator __hint, iterator __res)
       {
-       return (__hint == __res ||
-               (__hint == this->end() && ++__res == this->end()) ||
-               (__hint != this->end() && (++__hint == __res ||
-                                          ++__res == --__hint)));
+       return (__hint == __res
+               || (__hint == this->end() && ++__res == this->end())
+               || (__hint != this->end() && (++__hint == __res
+                                             || ++__res == --__hint)));
       }
     };
 
Index: include/profile/set.h
===================================================================
--- include/profile/set.h       (revision 210911)
+++ include/profile/set.h       (working copy)
@@ -399,15 +399,15 @@
        * operations have equivalent insertion cost so we do not update metrics
        * about it.
        * Note that to find out if hint has been used is libstdc++
-       * implementation dependant.
+       * implementation dependent.
        */
       bool
       _M_hint_used(const_iterator __hint, iterator __res)
       {
-       return (__hint == __res ||
-               (__hint == this->end() && ++__res == this->end()) ||
-               (__hint != this->end() && (++__hint == __res ||
-                                          ++__res == --__hint)));
+       return (__hint == __res
+               || (__hint == this->end() && ++__res == this->end())
+               || (__hint != this->end() && (++__hint == __res
+                                             || ++__res == --__hint)));
       }
     };
 

Reply via email to