Merge from V6_main 01/04/2013

[samples/component.git] / src / AddComponent / Adder_Impl.cxx

diff --git a/src/AddComponent/Adder_Impl.cxx b/src/AddComponent/Adder_Impl.cxx
index eb19c65a09966f37a94eea85e4d785be46d6f55d..8ea13821e15d4b59291fff1571d3fd36aad24f3b 100644 (file)
--- a/src/AddComponent/Adder_Impl.cxx
+++ b/src/AddComponent/Adder_Impl.cxx
@@ -1,31 +1,30 @@
-//  SuperVisionTest AddComponent : example of component that adds two numbers
+// Copyright (C) 2007-2013  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  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. 
-// 
-//  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. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// 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.
 //
+// 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.
 //
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  SuperVisionTest AddComponent : example of component that adds two numbers
 //  File   : AddComponent_Impl.cxx
 //  Author : Jean Rahuel, CEA
 //  Module : SuperVisionTest
-
-using namespace std;
+//
 #include <stdio.h>
 #include <unistd.h>
 #include <fstream>
@@ -39,6 +38,9 @@ using namespace std;
 #include "SALOME_LifeCycleCORBA.hxx"
 
 #include "Adder_Impl.hxx"
+#include "COMPONENT_version.h"
+
+using namespace std;
 
 Adder_Impl::Adder_Impl( CORBA::ORB_ptr orb ,
                        PortableServer::POA_ptr poa ,
@@ -69,6 +71,15 @@ Adder_Impl::~Adder_Impl() {
   endService( "Adder_Impl::~Adder_Impl" );
 }
 
+char* Adder_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 void Adder_Impl::destroy() {
   _poa->deactivate_object(*_id) ;
   CORBA::release(_poa) ;
@@ -76,7 +87,7 @@ void Adder_Impl::destroy() {
   _thisObj->_remove_ref();
 }
 
-double Adder_Impl::Add( double x , double y , double & z ) {
+CORBA::Double Adder_Impl::Add( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) {
   beginService( " Adder_Impl::Add" );
   z = x + y ;
   int S;
@@ -94,16 +105,16 @@ double Adder_Impl::Add( double x , double y , double & z ) {
   return -(x - y) ;
 }
 
-double Adder_Impl::AddWithoutSleep( double x , double y , double & z ) {
+CORBA::Double Adder_Impl::AddWithoutSleep( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) {
   beginService( " Adder_Impl::AddWithoutSleep" );
   z = x + y ;
   endService( " Adder_Impl::AddWithoutSleep"  );
   return -(x - y) ;
 }
 
-double Adder_Impl::AddAndCompare( const double x , const double y ,
-                                  const SuperVisionTest::Adder_ptr anOtherAdder ,
-                                  double & z ) {
+CORBA::Double Adder_Impl::AddAndCompare( CORBA::Double x , CORBA::Double y ,
+                                         SuperVisionTest::Adder_ptr anOtherAdder ,
+                                         CORBA::Double & z ) {
   beginService( " Adder_Impl::AddAndCompare" );
   z = x + y ;
   int S;
@@ -133,7 +144,7 @@ double Adder_Impl::AddAndCompare( const double x , const double y ,
   return ValFunc ;
 }
 
-void Adder_Impl::SetLastResult( double z ) {
+void Adder_Impl::SetLastResult( CORBA::Double z ) {
   beginService( " Adder_Impl::SetLastResult" );
   sendMessage(NOTIF_STEP, "Adder_Impl::SetLastResult is Computing");
   int S;
@@ -147,7 +158,7 @@ void Adder_Impl::SetLastResult( double z ) {
   return ;
 }
 
-void Adder_Impl::LastResult( double & z ) {
+void Adder_Impl::LastResult( CORBA::Double & z ) {
   beginService( " Adder_Impl::LastResult" );
   sendMessage(NOTIF_STEP, "Adder_Impl::LastResult is Computing");
   int S;
@@ -161,11 +172,11 @@ void Adder_Impl::LastResult( double & z ) {
   return ;
 }
 
-Engines::Component_ptr Adder_Impl::LccAddComponent( const char * aContainer ,
-                                                    const char * aComponentName ) {
+Engines::EngineComponent_ptr Adder_Impl::LccAddComponent( const char * aContainer ,
+                                                          const char * aComponentName ) {
   beginService( "Adder_Impl::LccAddComponent" );
-  Engines::Component_ptr objComponent ;
-  objComponent = Engines::Component::_nil() ;
+  Engines::EngineComponent_ptr objComponent ;
+  objComponent = Engines::EngineComponent::_nil() ;
 
   ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
   ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
@@ -180,4 +191,3 @@ Engines::Component_ptr Adder_Impl::LccAddComponent( const char * aContainer ,
   endService( "Adder_Impl::LccAddComponent"  );
   return objComponent ;
 }
-