X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FBasics%2FBasics_Utils.hxx;h=ddb351d3bc788b30cc9d35b6895db04a2b56d474;hb=fe5ea3510b95a62e53548b5f4130d1dc25b9c433;hp=4ca0f7c50414d0fffe93e37b9f38819e743308b3;hpb=641929d327319a80b4fc6f6157605a21f46413c4;p=modules%2Fkernel.git

diff --git a/src/Basics/Basics_Utils.hxx b/src/Basics/Basics_Utils.hxx
old mode 100755
new mode 100644
index 4ca0f7c50..ddb351d3b
--- a/src/Basics/Basics_Utils.hxx
+++ b/src/Basics/Basics_Utils.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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
@@ -19,7 +19,7 @@
 
 //  SALOME Utils : general SALOME's definitions and tools
 //  File   : Basics_DirUtils.hxx
-//  Autor  : Alexander A. BORODIN
+//  Author  : Alexander A. BORODIN
 //  Module : SALOME
 //
 #ifndef _Basics_UTILS_HXX_
@@ -32,7 +32,6 @@
 #ifndef WIN32
 #include <sys/time.h>
 #else
-#include <winsock2.h>
 #include <windows.h>
 #pragma comment(lib,"winmm.lib")
 #endif
@@ -57,6 +56,18 @@ namespace Kernel_Utils
     ObjectdID       //!< Global usage object identifier ID
   };
 
+  BASICS_EXPORT const wchar_t* decode(const char* encoded);
+  BASICS_EXPORT const wchar_t* decode_s(std::string encoded);
+  BASICS_EXPORT const char* encode(const wchar_t* decoded);
+  BASICS_EXPORT std::string encode_s(const wchar_t* decoded);
+
+#ifdef WIN32
+  BASICS_EXPORT char* utf8_encode(const wchar_t* encoded);
+  BASICS_EXPORT wchar_t* utf8_decode(const char* decoded);
+  BASICS_EXPORT std::string utf8_encode_s(const std::wstring& encoded);
+  BASICS_EXPORT std::wstring utf8_decode_s(const std::string& decoded);
+#endif
+
   //! Get predefined GUID
   BASICS_EXPORT std::string GetGUID( GUIDtype );
 #ifndef WIN32