(file) Return to String.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/String.cpp between version 1.114 and 1.115

version 1.114, 2005/10/24 19:35:25 version 1.115, 2005/11/27 03:11:36
Line 37 
Line 37 
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include <cassert>  #include <Pegasus/Common/PegasusAssert.h>
 #include <cstring> #include <cstring>
 #include "InternalException.h" #include "InternalException.h"
 #include "CommonUTF.h" #include "CommonUTF.h"
Line 891 
Line 891 
     if (_rep->refs.get() != 1)     if (_rep->refs.get() != 1)
         _rep = StringRep::copyOnWrite(_rep);         _rep = StringRep::copyOnWrite(_rep);
  
     assert(index + n <= _rep->size);      PEGASUS_ASSERT(index + n <= _rep->size);
  
     size_t rem = _rep->size - (index + n);     size_t rem = _rep->size - (index + n);
     Uint16* data = _rep->data;     Uint16* data = _rep->data;
Line 1102 
Line 1102 
  
 int String::compare(const String& s1, const String& s2, Uint32 n) int String::compare(const String& s1, const String& s2, Uint32 n)
 { {
     assert(n <= s1._rep->size);      PEGASUS_ASSERT(n <= s1._rep->size);
     assert(n <= s2._rep->size);      PEGASUS_ASSERT(n <= s2._rep->size);
  
     // Ignoring error in which n is greater than s1.size() or s2.size()     // Ignoring error in which n is greater than s1.size() or s2.size()
     return _compare(s1._rep->data, s2._rep->data, n);     return _compare(s1._rep->data, s2._rep->data, n);


Legend:
Removed from v.1.114  
changed lines
  Added in v.1.115

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2