Merge with branch1.1

1 files changed, 0 insertions, 3 deletions

diff --git a/src/shared/util.cpp b/src/shared/util.cpp
index 4378e03c..22657e6c 100644
--- a/src/shared/util.cpp
+++ b/src/shared/util.cpp
@@ -69,7 +69,6 @@ std::string ToString(const std::wstring &source, bool utf8)
     ::WideCharToMultiByte(CP_UTF8, 0, source.c_str(), -1, buffer, MAX_PATH, NULL, NULL);

   } else {

     ::WideCharToMultiByte(GetACP(), 0, source.c_str(), -1, buffer, MAX_PATH, NULL, NULL);

-//    wcstombs(buffer, source.c_str(), MAX_PATH);

   }

   return std::string(buffer);

 }

@@ -80,9 +79,7 @@ std::wstring ToWString(const std::string &source, bool utf8)
   if (utf8) {

     ::MultiByteToWideChar(CP_UTF8, 0, source.c_str(), -1, buffer, MAX_PATH);

   } else {

-    // codepage encoding

     ::MultiByteToWideChar(GetACP(), 0, source.c_str(), -1, buffer, MAX_PATH);

-//    mbstowcs(buffer, source.c_str(), MAX_PATH);

   }

   return std::wstring(buffer);

 }