Updated version and handling of hans.

Will Sobel · Will Sobel · commit 06fcf05f94cb · 2013-09-16T14:53:03.000-07:00
diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt
@@ -10,6 +10,7 @@ set (AGENT_VERSION_MAJOR 1)
 set (AGENT_VERSION_MINOR 3)
 set (AGENT_VERSION_PATCH 0)
 set (AGENT_VERSION_BUILD 0)
+set (AGENT_VERSION_RC "_RC1")
 
 if(WIN32)
   if(CMAKE_CL_64)
diff --git a/agent/globals.hpp b/agent/globals.hpp
@@ -34,9 +34,11 @@
 #include <sstream>
 #include <fstream>
 #include <string>
+#include <limits>
 
 #ifdef _WINDOWS
 #define ISNAN(x) _isnan(x)
+#define NAN numeric_limits<long double>::quiet_NaN()
 typedef unsigned __int64 uint64_t;
 #define strtoull _strtoui64
 #else
diff --git a/agent/version.cpp b/agent/version.cpp
@@ -19,8 +19,8 @@
  
 void PrintMTConnectAgentVersion()
  {
-   printf("MTConnect Agent Version %d.%d.%d.%d - built on " __TIMESTAMP__ "\n", 
+   printf("MTConnect Agent Version %d.%d.%d.%d%s - built on " __TIMESTAMP__ "\n", 
           AGENT_VERSION_MAJOR, AGENT_VERSION_MINOR, AGENT_VERSION_PATCH,
-          AGENT_VERSION_BUILD);
+          AGENT_VERSION_BUILD, AGENT_VERSION_RC);
  }
  
diff --git a/agent/version.h.in b/agent/version.h.in
@@ -3,5 +3,6 @@
 #define AGENT_VERSION_MINOR @AGENT_VERSION_MINOR@
 #define AGENT_VERSION_PATCH @AGENT_VERSION_PATCH@
 #define AGENT_VERSION_BUILD @AGENT_VERSION_BUILD@
+#define AGENT_VERSION_RC    "@AGENT_VERSION_RC@"
 
 extern void PrintMTConnectAgentVersion();
diff --git a/test/version.h b/test/version.h
@@ -3,5 +3,6 @@
 #define AGENT_VERSION_MINOR 0
 #define AGENT_VERSION_PATCH 0
 #define AGENT_VERSION_BUILD 0
+#define AGENT_VERSION_RC "_X"
 
 extern void PrintMTConnectAgentVersion();

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@`
`19`	`19`
`20`	`20`	`void PrintMTConnectAgentVersion()`
`21`	`21`	`{`
`22`		`- printf("MTConnect Agent Version %d.%d.%d.%d - built on " __TIMESTAMP__ "\n",`
	`22`	`+ printf("MTConnect Agent Version %d.%d.%d.%d%s - built on " __TIMESTAMP__ "\n",`
`23`	`23`	`AGENT_VERSION_MAJOR, AGENT_VERSION_MINOR, AGENT_VERSION_PATCH,`
`24`		`- AGENT_VERSION_BUILD);`
	`24`	`+ AGENT_VERSION_BUILD, AGENT_VERSION_RC);`
`25`	`25`	`}`
`26`	`26`