Merge branch 'V9_7_BR'

[modules/kernel.git] / src / Basics / Basics_Utils.cxx

diff --git a/src/Basics/Basics_Utils.cxx b/src/Basics/Basics_Utils.cxx
index 2ef4de8e006545a569982ff4871a11f5a9e88371..1d8fd16e0f7f6091deb400f0e953f76d1539deeb 100644 (file)
--- a/src/Basics/Basics_Utils.cxx
+++ b/src/Basics/Basics_Utils.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -184,9 +184,9 @@ namespace Kernel_Utils
   char* utf8_encode(const wchar_t* encoded)
   {
          if (encoded == NULL) return NULL;
-         int size_needed = WideCharToMultiByte(CP_UTF8, 0, encoded, std::wcslen(encoded), NULL, 0, NULL, NULL);
+    auto size_needed = WideCharToMultiByte(CP_UTF8, 0, encoded, (int)std::wcslen(encoded), NULL, 0, NULL, NULL);
          char* strTo = new char[ size_needed + 1 ];
-         WideCharToMultiByte(CP_UTF8, 0, encoded, std::wcslen(encoded), strTo, size_needed, NULL, NULL);
+         WideCharToMultiByte(CP_UTF8, 0, encoded, (int)std::wcslen(encoded), strTo, size_needed, NULL, NULL);
          strTo[size_needed] = '\0';
          return strTo;
   }
@@ -194,9 +194,9 @@ namespace Kernel_Utils
   wchar_t* utf8_decode(const char* decoded)
   {
          if (decoded == NULL) return NULL;
-         int size_needed = MultiByteToWideChar(CP_UTF8, 0, decoded, strlen(decoded), NULL, 0);
+    auto size_needed = MultiByteToWideChar(CP_UTF8, 0, decoded, (int)strlen(decoded), NULL, 0);
          wchar_t* wstrTo = new wchar_t[ size_needed + 1 ];
-         MultiByteToWideChar(CP_UTF8, 0, decoded, strlen(decoded), wstrTo, size_needed);
+         MultiByteToWideChar(CP_UTF8, 0, decoded, (int)strlen(decoded), wstrTo, size_needed);
          wstrTo[size_needed] = '\0';
          return wstrTo;
   }