Merge from V6_main 13/12/2012

[samples/calculator.git] / src / CALCULATOR / CALCULATOR.cxx

diff --git a/src/CALCULATOR/CALCULATOR.cxx b/src/CALCULATOR/CALCULATOR.cxx
index 8f65736668c1cf076cd9258a235be2d02b029bda..e46793d1589707a3f1e79ff9301172892ab6d9b8 100644 (file)
--- a/src/CALCULATOR/CALCULATOR.cxx
+++ b/src/CALCULATOR/CALCULATOR.cxx
@@ -21,6 +21,7 @@
 //
 
 #include "CALCULATOR.hxx"
+#include "CALCULATOR_version.h"
 
 #include "MEDCouplingFieldDoubleClient.hxx"
 #include "MEDCouplingMeshClient.hxx"
@@ -386,6 +387,15 @@ CALCULATOR_ORB::ErrorCode CALCULATOR::getErrorCode()
   return _errorCode;
 }
 
+// Version information
+char* CALCULATOR::getVersion()
+{
+#if CALCULATOR_DEVELOPMENT
+  return CORBA::string_dup(CALCULATOR_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(CALCULATOR_VERSION_STR);
+#endif
+}
 
 //=============================================================================
 /*!