Merge from V6_main 13/12/2012

[samples/atomsolv.git] / src / ATOMSOLV / ATOMSOLV.cxx

diff --git a/src/ATOMSOLV/ATOMSOLV.cxx b/src/ATOMSOLV/ATOMSOLV.cxx
index e38703f829f890b736523cb703084fd5604e2e06..9afd411e1bd45b64d9c32400e49c92f5fda8245a 100755 (executable)
--- a/src/ATOMSOLV/ATOMSOLV.cxx
+++ b/src/ATOMSOLV/ATOMSOLV.cxx
@@ -19,6 +19,7 @@
 
 using namespace std;
 #include "ATOMSOLV.hxx"
+#include "ATOMSOLV_version.h"
 #include "utilities.h"
 
 #include <string>
@@ -82,6 +83,14 @@ CORBA::Boolean ATOMSOLV::processData( CORBA::Long studyID )
   return true;
 }
 
+char* ATOMSOLV::getVersion()
+{
+#if ATOMSOLV_DEVELOPMENT
+  return CORBA::string_dup(ATOMSOLV_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(ATOMSOLV_VERSION_STR);
+#endif
+}
 
 extern "C"
 {