Merge from V6_main 13/12/2012

[samples/component.git] / src / DataStreamComponent / DataStreamComponent_Impl.cxx

diff --git a/src/DataStreamComponent/DataStreamComponent_Impl.cxx b/src/DataStreamComponent/DataStreamComponent_Impl.cxx
index 2c08ea450c3aee04c31ea4d2823873606b8f244e..412fabbecea5807fde5eddd6b58807fa5e40344d 100644 (file)
--- a/src/DataStreamComponent/DataStreamComponent_Impl.cxx
+++ b/src/DataStreamComponent/DataStreamComponent_Impl.cxx
@@ -31,6 +31,7 @@
 #include <sstream>
 #include <string>
 
+#include "COMPONENT_version.h"
 #include "DataStreamComponent_Impl.hxx"
 
 using namespace std;
@@ -54,6 +55,15 @@ DataStreamFactory_Impl::DataStreamFactory_Impl() {
 DataStreamFactory_Impl::~DataStreamFactory_Impl() {
 }
 
+char* DataStreamFactory_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 void DataStreamFactory_Impl::Setxy( CORBA::Long x , CORBA::Long y ) {
   _x = x ;
   _y = y ;
@@ -136,6 +146,15 @@ DataStream_Impl::~DataStream_Impl() {
   endService( "DataStream_Impl::~DataStream_Impl" );
 }
 
+char* DataStream_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 void DataStream_Impl::StreamSetxy( CORBA::Long x , CORBA::Long y ) {
   _x = x ;
   _y = y ;