Join modifications from branch V3_1_0_For_CCRT

[samples/component.git] / src / SIGNALSComponent / SIGNALSComponent.cxx

diff --git a/src/SIGNALSComponent/SIGNALSComponent.cxx b/src/SIGNALSComponent/SIGNALSComponent.cxx
index 0da7521cc5c3533040c814508625009c6381d571..6427510e8bb3d4a7622d9dd5218897641179037f 100755 (executable)
--- a/src/SIGNALSComponent/SIGNALSComponent.cxx
+++ b/src/SIGNALSComponent/SIGNALSComponent.cxx
@@ -25,7 +25,6 @@
 //  Author : MARC TAJCHMAN, CEA
 //  Module : SuperVisionTest
 
-using namespace std;
 #include <stdio.h>
 #include <unistd.h>
 #include <fstream>
@@ -35,6 +34,8 @@ using namespace std;
 //#include "utilities.h"
 #include "SIGNALSComponent.hxx"
 
+using namespace std;
+
 SIGNALSComponentEngine::SIGNALSComponentEngine( CORBA::ORB_ptr orb,
                                    PortableServer::POA_ptr poa,
                                    PortableServer::ObjectId * contId, 
@@ -59,7 +60,7 @@ SIGNALSComponentEngine::~SIGNALSComponentEngine()
 {
 }
 
-long SIGNALSComponentEngine::SIGSEGVfunc() {
+CORBA::Long SIGNALSComponentEngine::SIGSEGVfunc() {
   beginService( " SIGNALSComponentEngine::SIGSEGVfunc" );
   int S = 10 ;
   while ( S ) {
@@ -70,7 +71,7 @@ long SIGNALSComponentEngine::SIGSEGVfunc() {
   return nullptr ;
 }
 
-long SIGNALSComponentEngine::SIGFPEfunc( long a , long b ) {
+CORBA::Long SIGNALSComponentEngine::SIGFPEfunc( CORBA::Long a , CORBA::Long b ) {
   beginService( " SIGNALSComponentEngine::SIGFPEfunc" );
   int S = 10 ;
   while ( S ) {