Salome HOME
projects
/
samples
/
component.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Increment version: 8.1.0
[samples/component.git]
/
src
/
AdditionComponent
/
AdditionComponent_Impl.cxx
diff --git
a/src/AdditionComponent/AdditionComponent_Impl.cxx
b/src/AdditionComponent/AdditionComponent_Impl.cxx
index b4f218483ef684ff90e073d4773f6d9db3bf142a..adae20cc5cd3a3e4fa4442eafb9ddffadab26b39 100644
(file)
--- a/
src/AdditionComponent/AdditionComponent_Impl.cxx
+++ b/
src/AdditionComponent/AdditionComponent_Impl.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-26,7
+26,11
@@
// Module : SuperVisionTest
//
#include <stdio.h>
// Module : SuperVisionTest
//
#include <stdio.h>
+#ifndef WIN32
#include <unistd.h>
#include <unistd.h>
+#else
+#include <process.h>
+#endif
#include <fstream>
#include <sstream>
#include <string>
#include <fstream>
#include <sstream>
#include <string>
@@
-39,6
+43,7
@@
#include "AdditionComponent_Impl.hxx"
#include "Adder_Impl.hxx"
#include "AdditionComponent_Impl.hxx"
#include "Adder_Impl.hxx"
+#include "COMPONENT_version.h"
using namespace std;
using namespace std;
@@
-63,6
+68,15
@@
AdditionInterface_Impl::AdditionInterface_Impl() {
AdditionInterface_Impl::~AdditionInterface_Impl() {
}
AdditionInterface_Impl::~AdditionInterface_Impl() {
}
+char* AdditionInterface_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+ return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+ return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
CORBA::Double AdditionInterface_Impl::Add( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) {
beginService( " AdditionInterface_Impl::Add" );
z = x + y ;
CORBA::Double AdditionInterface_Impl::Add( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) {
beginService( " AdditionInterface_Impl::Add" );
z = x + y ;
@@
-71,11
+85,14
@@
CORBA::Double AdditionInterface_Impl::Add( CORBA::Double x , CORBA::Double y , C
sendMessage(NOTIF_STEP, "AdditionInterface_Impl::Add is Computing");
// S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
S = 5 ;
sendMessage(NOTIF_STEP, "AdditionInterface_Impl::Add is Computing");
// S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
S = 5 ;
+#ifndef WIN32
while ( S ) {
while ( S ) {
- S = sleep(
S)
;
+ S = sleep(
S )
;
}
}
- MESSAGE( "AdditionInterface_Impl::Add( " << x << " , " << y << " , " << z
- << " ) returns " << (x - y) << " after " << S << " seconds" )
+#else
+ Sleep(S*1000);
+#endif
+ MESSAGE( "AdditionInterface_Impl::Add( " << x << " , " << y << " , " << z << " ) returns " << (x - y) << " after " << S << " seconds" )
LastAddition = z ;
endService( " AdditionInterface_Impl::Add" );
return (x - y) ;
LastAddition = z ;
endService( " AdditionInterface_Impl::Add" );
return (x - y) ;
@@
-105,25
+122,37
@@
CORBA::Long AdditionInterface_Impl::Sigma( CORBA::Long n ) {
void AdditionInterface_Impl::Setx( CORBA::Double x ) {
int S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
void AdditionInterface_Impl::Setx( CORBA::Double x ) {
int S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
+#ifndef WIN32
while ( S ) {
while ( S ) {
- S = sleep(
S)
;
+ S = sleep(
S )
;
}
}
+#else
+ Sleep(S*1000);
+#endif
xx = x ;
}
void AdditionInterface_Impl::Sety( CORBA::Double y ) {
int S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
xx = x ;
}
void AdditionInterface_Impl::Sety( CORBA::Double y ) {
int S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
+#ifndef WIN32
while ( S ) {
while ( S ) {
- S = sleep(
S)
;
+ S = sleep(
S )
;
}
}
+#else
+ Sleep(S*1000);
+#endif
yy = y ;
}
CORBA::Double AdditionInterface_Impl::Addxy() {
int S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
yy = y ;
}
CORBA::Double AdditionInterface_Impl::Addxy() {
int S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
+#ifndef WIN32
while ( S ) {
while ( S ) {
- S = sleep(
S)
;
+ S = sleep(
S )
;
}
}
+#else
+ Sleep(S*1000);
+#endif
double zz = xx + yy ;
LastAddition = zz ;
return zz;
double zz = xx + yy ;
LastAddition = zz ;
return zz;
@@
-131,9
+160,13
@@
CORBA::Double AdditionInterface_Impl::Addxy() {
CORBA::Double AdditionInterface_Impl::AddyTox( CORBA::Double y ) {
int S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
CORBA::Double AdditionInterface_Impl::AddyTox( CORBA::Double y ) {
int S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
+#ifndef WIN32
while ( S ) {
while ( S ) {
- S = sleep(
S)
;
+ S = sleep(
S )
;
}
}
+#else
+ Sleep(S*1000);
+#endif
double zz = xx + y ;
LastAddition = zz ;
return zz;
double zz = xx + y ;
LastAddition = zz ;
return zz;
@@
-239,8
+272,13
@@
extern "C"
const char *instanceName,
const char *interfaceName)
{
const char *instanceName,
const char *interfaceName)
{
+#ifndef WIN32
MESSAGE("AdditionComponentEngine_factory AdditionInterfaceEngine ("
<< instanceName << "," << interfaceName << "," << getpid() << ")");
MESSAGE("AdditionComponentEngine_factory AdditionInterfaceEngine ("
<< instanceName << "," << interfaceName << "," << getpid() << ")");
+#else
+ MESSAGE("AdditionComponentEngine_factory AdditionInterfaceEngine ("
+ << instanceName << "," << interfaceName << "," << _getpid() << ")");
+#endif
AdditionInterface_Impl * myAdditionInterface
= new AdditionInterface_Impl(orb, poa, contId, instanceName, interfaceName);
return myAdditionInterface->getId() ;
AdditionInterface_Impl * myAdditionInterface
= new AdditionInterface_Impl(orb, poa, contId, instanceName, interfaceName);
return myAdditionInterface->getId() ;