X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fcharsetconverter.cpp;h=b56eb2dc8edd3b50dbe802604c9e4d4dbef4502e;hb=dec33c63afafabf83c3039e916725cac6faef9b3;hp=4685adde2537c3e87b5341ca64fbc474f85dfe43;hpb=9a14c0d9f7f7c319e539583b93664953764e83b7;p=fms.git diff --git a/src/charsetconverter.cpp b/src/charsetconverter.cpp index 4685add..b56eb2d 100644 --- a/src/charsetconverter.cpp +++ b/src/charsetconverter.cpp @@ -49,7 +49,7 @@ const bool CharsetConverter::Convert(const std::string &input, std::string &outp { std::vector invec(input.begin(),input.end()); std::vector outvec(invec.size()*4,0); -#if defined(_WIN32) || defined(__APPLE__) || defined(__DARWIN__) +#if defined(_WIN32) //|| defined(__APPLE__) || defined(__DARWIN__) const char *inptr=&invec[0]; #else char *inptr=&invec[0]; @@ -66,6 +66,7 @@ const bool CharsetConverter::Convert(const std::string &input, std::string &outp outvec.resize(outptr-&outvec[0]); output=""; output.append(outvec.begin(),outvec.end()); + return true; } else {