Salome HOME
projects
/
modules
/
hexablock.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update 2020
[modules/hexablock.git]
/
src
/
HEXABLOCK
/
HexDocument.hxx
diff --git
a/src/HEXABLOCK/HexDocument.hxx
b/src/HEXABLOCK/HexDocument.hxx
old mode 100755
(executable)
new mode 100644
(file)
index
82f71a3
..
1f9e49e
--- a/
src/HEXABLOCK/HexDocument.hxx
+++ b/
src/HEXABLOCK/HexDocument.hxx
@@
-1,7
+1,7
@@
// class : Document
// class : Document
-// Copyright (C) 2009-20
14
CEA/DEN, EDF R&D
+// Copyright (C) 2009-20
20
CEA/DEN, EDF R&D
//
// 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
@@
-26,6
+26,8
@@
#include "Hex_defines.hxx"
#include "HexEltBase.hxx"
#include "Hex_defines.hxx"
#include "HexEltBase.hxx"
+#include <algorithm>
+
#ifdef WIN32
#ifdef max
#undef max
#ifdef WIN32
#ifdef max
#undef max
@@
-341,8
+343,8
@@
public:
void reorderQuads ();
// --------------------------------------------------- Evols Hexa5
void reorderQuads ();
// --------------------------------------------------- Evols Hexa5
- cpchar getNextName (EnumElt type, string& name);
- string getNextName (EnumElt type);
+ cpchar getNextName (EnumElt type, st
d::st
ring& name);
+ st
d::st
ring getNextName (EnumElt type);
virtual char* makeVarName (char* name);
void lockDump();
virtual char* makeVarName (char* name);
void lockDump();