X-Git-Url: https://cygwin.com/git/?a=blobdiff_plain;f=String%2B%2B.cc;h=4d089a86d706adc16c422d8022e31d3d647d0bc5;hb=f37b36a368e8534c216e5f0096b02a15eaee3dbe;hp=a92878fc21d37c29013b7b1c1b685c011baf270e;hpb=b401ef478e1868add6af00ba6694bf0612970ee2;p=cygwin-apps%2Fsetup.git diff --git a/String++.cc b/String++.cc index a92878fc..4d089a86 100644 --- a/String++.cc +++ b/String++.cc @@ -18,12 +18,13 @@ #include "String++.h" #include #include -#include "concat.h" #include "io_stream.h" #include -#include +#include #include +using namespace std; + // _data String::_data::_data(_data const &aData) : count (1), theString (new unsigned char[aData.length]), cstr(0), length (aData.length) { @@ -55,10 +56,10 @@ String::~String () String::String (int const anInt) { - ostrstream os; + ostringstream os; os << anInt; - theData = new _data(os.pcount()); - memcpy (theData->theString, os.str(), os.pcount()); + theData = new _data(os.str().size()); + memcpy (theData->theString, os.str().c_str(), os.str().size()); } String::String (string const &aString) : theData (new _data (aString.c_str() ? strlen (aString.c_str()) : 0))