Revert "Synchronize adm files"

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

diff --git a/src/SubComponent/SubComponent.cxx b/src/SubComponent/SubComponent.cxx
index ee4114931bad97a04026d3cffff13aea94dc9f3d..decd3f92df606fd963e1d6a95d04d8b95691d538 100644 (file)
--- a/src/SubComponent/SubComponent.cxx
+++ b/src/SubComponent/SubComponent.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -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
-// 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
@@ -26,12 +26,14 @@
 //  Module : SuperVisionTest
 //
 #include <stdio.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <fstream>
 #include <sstream>
 #include <string>
 
-//#include "utilities.h"
+#include "COMPONENT_version.h"
 #include "SubComponent.hxx"
 
 using namespace std;
@@ -58,6 +60,15 @@ SubComponentEngine::~SubComponentEngine()
 {
 }
 
+char* SubComponentEngine::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 void SubComponentEngine::Sub( double x , double y , double & z ) {
   beginService( " SubComponentEngine::Sub" );
   z = x - y ;
@@ -66,9 +77,13 @@ void SubComponentEngine::Sub( double x , double y , double & z ) {
   sendMessage(NOTIF_STEP, "Sub is Computing");
 //  S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
   S = 5 ;
+#ifndef WIN32
   while ( S ) {
-    S = sleep(S);
+    S = sleep( S ) ;
   }
+#else
+  Sleep(S*1000);
+#endif
   MESSAGE( "SubComponentEngine::Sub( " <<  x << " , " << y << " , " << z
        << " ) after " << S << " seconds" )
   endService( " SubComponentEngine::Sub"  );