diff --git a/src/string b/src/string index e60b5771..17b3c14c 100644 --- a/src/string +++ b/src/string @@ -202,13 +202,13 @@ public: r = n; } resize(r); - Tr::copy(vector::data, str.vector::data + pos, r); + Tr::copy(vector::data_, str.vector::data_ + pos, r); return *this; } _UCXXEXPORT basic_string& assign(const Ch* s, size_type n){ resize(n); - Tr::copy(vector::data, s, n); + Tr::copy(vector::data_, s, n); return *this; } @@ -246,8 +246,8 @@ public: } size_type temp = vector::elements; resize(vector::elements + r); - Tr::move(vector::data + pos1 + r, vector::data + pos1, temp - pos1); - Tr::copy(vector::data + pos1, str.vector::data + pos2, r); + Tr::move(vector::data_ + pos1 + r, vector::data_ + pos1, temp - pos1); + Tr::copy(vector::data_ + pos1, str.vector::data_ + pos2, r); return *this; } @@ -279,8 +279,8 @@ public: } size_type temp = vector::elements; resize(vector::elements + n); - Tr::move(vector::data + pos + n, vector::data + pos, temp - pos); - Tr::assign(vector::data + pos, n, c); + Tr::move(vector::data_ + pos + n, vector::data_ + pos, temp - pos); + Tr::assign(vector::data_ + pos, n, c); return *this; } @@ -296,7 +296,7 @@ public: } size_type temp = vector::elements; - Tr::move(vector::data + pos, vector::data + pos + xlen, temp - pos - xlen); + Tr::move(vector::data_ + pos, vector::data_ + pos + xlen, temp - pos - xlen); resize(temp - xlen); return *this; } @@ -361,8 +361,8 @@ public: //Initial block is of size pos1 //Block 2 is of size len - Tr::move(vector::data + pos1 + rlen, vector::data + pos1 + xlen, temp - pos1 - xlen); - Tr::copy(vector::data + pos1, str.vector::data + pos2, rlen); + Tr::move(vector::data_ + pos1 + rlen, vector::data_ + pos1 + xlen, temp - pos1 - xlen); + Tr::copy(vector::data_ + pos1, str.vector::data_ + pos2, rlen); resize(temp - xlen + rlen); return *this; } @@ -394,7 +394,7 @@ public: if(r > n){ r = n; } - Tr::copy(s, vector::data + pos, r); + Tr::copy(s, vector::data_ + pos, r); return r; } @@ -605,7 +605,7 @@ public: if(rlen > len2){ rlen = len2; } - int retval = Tr::compare(vector::data + pos1, str.vector::data + pos2, rlen); + int retval = Tr::compare(vector::data_ + pos1, str.vector::data_ + pos2, rlen); if(retval == 0){ if(len1 < len2){ retval = -1; @@ -649,7 +649,7 @@ public: if(rlen > len2){ rlen = len2; } - int retval = Tr::compare(vector::data + pos1, s, rlen); + int retval = Tr::compare(vector::data_ + pos1, s, rlen); if(retval == 0){ if(len1 < len2){ retval = -1;