X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCouplingCorba%2FDataArrayServant.hxx;h=46e19fcf602b9d8ad6f1868c2d4623a9865a82bf;hb=087e7fc0f8aa7d941857a37de78844d0a8cf1ed2;hp=ec78f5a1dba3e489f991b60724db4587466d034f;hpb=94d102d362379da8b0dc676e72a7af0a0a0af49a;p=modules%2Fmed.git diff --git a/src/MEDCouplingCorba/DataArrayServant.hxx b/src/MEDCouplingCorba/DataArrayServant.hxx index ec78f5a1d..46e19fcf6 100644 --- a/src/MEDCouplingCorba/DataArrayServant.hxx +++ b/src/MEDCouplingCorba/DataArrayServant.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D +// Copyright (C) 2007-2015 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 // 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 @@ -16,19 +16,20 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // +// Author : Anthony Geay (CEA/DEN) #ifndef __DATAARRAYSERVANT_HXX__ #define __DATAARRAYSERVANT_HXX__ #include "SALOMEconfig.h" -#ifdef WNT +#ifdef WIN32 #define NOMINMAX #endif #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant) #include "MEDCouplingCorba.hxx" #include "MEDCouplingRefCountServant.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { class DataArray;