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_2_BR'
[modules/kernel.git]
/
src
/
SALOMEDSImpl
/
SALOMEDSImpl_Tool.hxx
diff --git
a/src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx
b/src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx
index 16cbbaf57f9c59bbc8fbcae478f9c9a7f3f1f296..9a58128492a6cff89c1332d4cba2b1a5aad3975c 100644
(file)
--- a/
src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx
+++ b/
src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx
@@
-35,6
+35,10
@@
#include <vector>
#include "DF_Label.hxx"
+#ifdef WIN32
+# undef GetUserName
+#endif
+
class SALOMEDSIMPL_EXPORT SALOMEDSImpl_Tool
{