-// Copyright (C) 2005 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019 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
//
// 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
+// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#ifndef _CALCULATOR_HXX_
-#define _CALCULATOR_HXX_
+
+#ifndef CALCULATOR_HXX
+#define CALCULATOR_HXX
+
+#ifdef WIN32
+# if defined CALCULATOREngine_EXPORTS
+# define CALCULATORENGINE_EXPORT __declspec( dllexport )
+# else
+# define CALCULATORENGINE_EXPORT __declspec( dllimport )
+# endif
+#else
+# define CALCULATORENGINE_EXPORT
+#endif
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(CALCULATOR_Gen)
-#include CORBA_CLIENT_HEADER(MED)
-#include "SALOME_Component_i.hxx"
+#include CORBA_CLIENT_HEADER(MEDCouplingCorbaServant)
+#include <SALOME_Component_i.hxx>
-class CALCULATOR:
+class CALCULATORENGINE_EXPORT CALCULATOR:
public POA_CALCULATOR_ORB::CALCULATOR_Gen,
public Engines_Component_i
{
-
public:
- CALCULATOR(CORBA::ORB_ptr orb,
- PortableServer::POA_ptr poa,
- PortableServer::ObjectId * contId,
- const char *instanceName,
- const char *interfaceName);
+ CALCULATOR( CORBA::ORB_ptr,
+ PortableServer::POA_ptr,
+ PortableServer::ObjectId*,
+ const char*,
+ const char* );
virtual ~CALCULATOR();
+ virtual char* getVersion();
- CORBA::Double convergenceCriteria(SALOME_MED::FIELDDOUBLE_ptr field);
- CORBA::Double normMax(SALOME_MED::FIELDDOUBLE_ptr field1);
- CORBA::Double normL2(SALOME_MED::FIELDDOUBLE_ptr field1);
- CORBA::Double norm2(SALOME_MED::FIELDDOUBLE_ptr field1);
- CORBA::Double normL1(SALOME_MED::FIELDDOUBLE_ptr field1);
- SALOME_MED::FIELDDOUBLE_ptr applyLin(SALOME_MED::FIELDDOUBLE_ptr field1,CORBA::Double a,CORBA::Double b);
- SALOME_MED::FIELDDOUBLE_ptr add(SALOME_MED::FIELDDOUBLE_ptr field1, SALOME_MED::FIELDDOUBLE_ptr field2);
- void printField(SALOME_MED::FIELDDOUBLE_ptr field);
- void cloneField(SALOME_MED::FIELDDOUBLE_ptr field,
- SALOME_MED::FIELDDOUBLE_out clone1, SALOME_MED::FIELDDOUBLE_out clone2,
- SALOME_MED::FIELDDOUBLE_out clone3, SALOME_MED::FIELDDOUBLE_out clone4);
+ CORBA::Double convergenceCriteria( SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr );
+ CORBA::Double normMax( SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr );
+ CORBA::Double normL2( SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr );
+ CORBA::Double norm2( SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr );
+ CORBA::Double normL1( SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr );
+ SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr applyLin( SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr,
+ CORBA::Double, CORBA::Double );
+ SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr add( SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr,
+ SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr );
+ void printField( SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr );
+ void cloneField( SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr,
+ SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_out,
+ SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_out,
+ SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_out,
+ SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_out );
CORBA::Boolean isDone();
CALCULATOR_ORB::ErrorCode getErrorCode();
CALCULATOR_ORB::ErrorCode _errorCode;
};
-//extern "C"
-// PortableServer::ObjectId * CALCULATOREngine_factory(
-// CORBA::ORB_ptr orb,
-// PortableServer::POA_ptr poa,
-// PortableServer::ObjectId * contId,
-// const char *instanceName,
-// const char *interfaceName);
-
-#endif
+#endif // CALCULATOR_HXX