Merge from V6_main_20120808 08Aug12

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

diff --git a/src/AddComponent/Adder_Impl.hxx b/src/AddComponent/Adder_Impl.hxx
index 17c1eb9a6a75ca5c915ee83d350398f37cc6a149..ffc4e6c2c893e2294b4fbde3fea17d7f50ef3aed 100644 (file)
--- a/src/AddComponent/Adder_Impl.hxx
+++ b/src/AddComponent/Adder_Impl.hxx
@@ -1,31 +1,31 @@
-//  SuperVisionTest AddComponent : example of component that adds two numbers
+// Copyright (C) 2007-2012  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   : Adder_Impl.hxx
 //  Author : Jean Rahuel, CEA
 //  Module : SuperVisionTest
 //  $Header:
-
+//
 #ifndef _ADDER_IMPL_HXX_
 #define _ADDER_IMPL_HXX_
 
@@ -51,20 +51,20 @@ class Adder_Impl :  public POA_SuperVisionTest::Adder ,
 
     virtual void destroy() ;
 
-    virtual double Add( double x , double y , double & z ) ;
+    virtual CORBA::Double Add( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) ;
 
-    virtual double AddWithoutSleep( double x , double y , double & z ) ;
+    virtual CORBA::Double AddWithoutSleep( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) ;
 
-    virtual double AddAndCompare( const double x , const double y ,
-                                  const SuperVisionTest::Adder_ptr anOtherAdder ,
-                                  double & z ) ;
+    virtual CORBA::Double AddAndCompare( CORBA::Double x , CORBA::Double y ,
+                                         SuperVisionTest::Adder_ptr anOtherAdder ,
+                                          CORBA::Double & z ) ;
 
-    virtual void SetLastResult( double z ) ;
+    virtual void SetLastResult( CORBA::Double z ) ;
 
-    virtual void LastResult( double & z ) ;
+    virtual void LastResult( CORBA::Double & z ) ;
 
-    virtual Engines::Component_ptr LccAddComponent( const char * aContainer ,
-                                                    const char * aComponentName ) ;
+    virtual Engines::EngineComponent_ptr LccAddComponent( const char * aContainer ,
+                                                          const char * aComponentName ) ;
 
   private: