Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/fbt/fix_french_translation'
[modules/smesh.git]
/
src
/
StdMeshers
/
SMESH_StdMeshers.hxx
diff --git
a/src/StdMeshers/SMESH_StdMeshers.hxx
b/src/StdMeshers/SMESH_StdMeshers.hxx
index 961884aceb69d3f5e5bb86b57c7032da0111f27f..b87764dbd6e5ae778844d07d6770518e274721f3 100755
(executable)
--- a/
src/StdMeshers/SMESH_StdMeshers.hxx
+++ b/
src/StdMeshers/SMESH_StdMeshers.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-28,7
+28,7
@@
#ifndef _SMESH_StdMeshers_HXX_
#define _SMESH_StdMeshers_HXX_
#ifndef _SMESH_StdMeshers_HXX_
#define _SMESH_StdMeshers_HXX_
-#ifdef W
NT
+#ifdef W
IN32
#if defined STDMESHERS_EXPORTS || defined StdMeshers_EXPORTS
#define STDMESHERS_EXPORT __declspec( dllexport )
#else
#if defined STDMESHERS_EXPORTS || defined StdMeshers_EXPORTS
#define STDMESHERS_EXPORT __declspec( dllexport )
#else