Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Python 3 porting: additional chnages.
[modules/kernel.git]
/
src
/
Basics
/
Basics_Utils.hxx
diff --git
a/src/Basics/Basics_Utils.hxx
b/src/Basics/Basics_Utils.hxx
index 4ca0f7c50414d0fffe93e37b9f38819e743308b3..cef9dc3fc7947e38626166404276100f09b84683 100644
(file)
--- a/
src/Basics/Basics_Utils.hxx
+++ b/
src/Basics/Basics_Utils.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-32,7
+32,6
@@
#ifndef WIN32
#include <sys/time.h>
#else
#ifndef WIN32
#include <sys/time.h>
#else
-#include <winsock2.h>
#include <windows.h>
#pragma comment(lib,"winmm.lib")
#endif
#include <windows.h>
#pragma comment(lib,"winmm.lib")
#endif
@@
-57,6
+56,11
@@
namespace Kernel_Utils
ObjectdID //!< Global usage object identifier ID
};
ObjectdID //!< Global usage object identifier ID
};
+ const wchar_t* decode(const char* encoded);
+ const wchar_t* decode_s(std::string encoded);
+ const char* encode(const wchar_t* decoded);
+ std::string encode_s(const wchar_t* decoded);
+
//! Get predefined GUID
BASICS_EXPORT std::string GetGUID( GUIDtype );
#ifndef WIN32
//! Get predefined GUID
BASICS_EXPORT std::string GetGUID( GUIDtype );
#ifndef WIN32