Exploiting a user-defined |operator->()| when the result is a pointer to a primitive type is problematic for the OS/2 VisualAge compiler. Eliminate such uses in the new string facilities. These are stragglers missed in an earlier checkin.

string/public/nsCharTraits.h

@@ -486,14 +486,14 @@ struct nsCharSourceTraits
     PRUint32
     readable_distance( const InputIterator& first, const InputIterator& last )
       {
-        return PRUint32(SameFragment(first, last) ? last.operator->()-first.operator->() : first.size_forward());
+        return PRUint32(SameFragment(first, last) ? last.get()-first.get() : first.size_forward());
       }
 
     static
     const typename InputIterator::value_type*
     read( const InputIterator& iter )
       {
-        return iter.operator->();
+        return iter.get();
       }
   };
 

xpcom/ds/nsCharTraits.h

@@ -486,14 +486,14 @@ struct nsCharSourceTraits
     PRUint32
     readable_distance( const InputIterator& first, const InputIterator& last )
       {
-        return PRUint32(SameFragment(first, last) ? last.operator->()-first.operator->() : first.size_forward());
+        return PRUint32(SameFragment(first, last) ? last.get()-first.get() : first.size_forward());
       }
 
     static
     const typename InputIterator::value_type*
     read( const InputIterator& iter )
       {
-        return iter.operator->();
+        return iter.get();
       }
   };
 

xpcom/string/public/nsCharTraits.h

@@ -486,14 +486,14 @@ struct nsCharSourceTraits
     PRUint32
     readable_distance( const InputIterator& first, const InputIterator& last )
       {
-        return PRUint32(SameFragment(first, last) ? last.operator->()-first.operator->() : first.size_forward());
+        return PRUint32(SameFragment(first, last) ? last.get()-first.get() : first.size_forward());
       }
 
     static
     const typename InputIterator::value_type*
     read( const InputIterator& iter )
       {
-        return iter.operator->();
+        return iter.get();
       }
   };