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 branch 'V9_7_BR'
[modules/kernel.git]
/
src
/
Basics
/
Basics_Utils.hxx
diff --git
a/src/Basics/Basics_Utils.hxx
b/src/Basics/Basics_Utils.hxx
index ddb351d3bc788b30cc9d35b6895db04a2b56d474..1f3e451253aecf2796f8eaf8b3550cb4b13e3dcf 100644
(file)
--- a/
src/Basics/Basics_Utils.hxx
+++ b/
src/Basics/Basics_Utils.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-34,8
+34,12
@@
#else
#include <windows.h>
#pragma comment(lib,"winmm.lib")
#else
#include <windows.h>
#pragma comment(lib,"winmm.lib")
+#pragma warning (disable : 4251)
#endif
#endif
+#ifndef SALOME_UNUSED
+#define SALOME_UNUSED(var) (void)var
+#endif
namespace Kernel_Utils
{
namespace Kernel_Utils
{
@@
-45,9
+49,13
@@
namespace Kernel_Utils
{
public:
Localizer();
{
public:
Localizer();
+ Localizer(int, const char*);
~Localizer();
private:
~Localizer();
private:
- std::string myCurLocale;
+ void init(int, const char*);
+ private:
+ int myCategory;
+ std::string myOriginalLocale;
};
//! GUID type
};
//! GUID type