[Mobies-commit] [commit] r4364 - in UDM/trunk: . include src/UdmGme

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Nov  6 08:41:48 2015
New Revision: 4364

Log:
VS2015 compilation support

Modified:
   UDM/trunk/include/ErrHand.h
   UDM/trunk/make.msbuild
   UDM/trunk/src/UdmGme/UdmGme.cpp

Modified: UDM/trunk/include/ErrHand.h
==============================================================================
--- UDM/trunk/include/ErrHand.h	Fri Nov  6 08:41:43 2015	(r4363)
+++ UDM/trunk/include/ErrHand.h	Fri Nov  6 08:41:48 2015	(r4364)
@@ -45,7 +45,10 @@
 #ifndef _DLL
 #pragma message("Warning: Udm clients should be compiled under /MD or /MDd")
 #endif
-#if (_MSC_VER == 1800) /* VS2013 VC12 */
+#if (_MSC_VER == 1900) /* VS2015 VC14 */
+#define UDM_NAMESPACE Udm_VC14
+#define UDM_PLATFORM_TOOLSET "v140"
+#elif (_MSC_VER == 1800) /* VS2013 VC12 */
 #define UDM_NAMESPACE Udm_VC12
 #define UDM_PLATFORM_TOOLSET "v120"
 #elif (_MSC_VER == 1700) /* VS2012 VC11 */
@@ -53,7 +56,7 @@
 #define UDM_PLATFORM_TOOLSET "v110"
 #endif
 
-#if (_MSC_VER == 1700) /* VS2012 VC11 */ || (_MSC_VER == 1800) /* VS2013 VC12 */
+#if (_MSC_VER == 1700) /* VS2012 VC11 */ || (_MSC_VER == 1800) /* VS2013 VC12 */ || (_MSC_VER == 1900) /* VS2015 VC14 */
 namespace UDM_NAMESPACE {};
 namespace Udm = UDM_NAMESPACE;
 #ifdef _DEBUG

Modified: UDM/trunk/make.msbuild
==============================================================================
--- UDM/trunk/make.msbuild	Fri Nov  6 08:41:43 2015	(r4363)
+++ UDM/trunk/make.msbuild	Fri Nov  6 08:41:48 2015	(r4364)
@@ -61,6 +61,15 @@
     <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="PlatformToolset=v120;Configuration=Debug;Platform=x64" />
     <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="PlatformToolset=v120;Configuration=Release;Platform=x64" />
   </Target>
+  <Target Name="BuildVC14" DependsOnTargets="CheckEnv">
+    <!-- invoke: msbuild make.msbuild /m /t:BuildVC14;BuildVC14_x64 /p:"VCTargetsPath=C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140" -->
+    <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="PlatformToolset=v140;Configuration=Debug" />
+    <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="PlatformToolset=v140;Configuration=Release" />
+  </Target>
+  <Target Name="BuildVC14_x64" DependsOnTargets="CheckEnv">
+    <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="PlatformToolset=v140;Configuration=Debug;Platform=x64" />
+    <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="PlatformToolset=v140;Configuration=Release;Platform=x64" />
+  </Target>
 
   <Target Name="UdmCliGen" DependsOnTargets="CheckEnv">
     <MSBuild Projects="src\UdmCliGen\make.msbuild"/>

Modified: UDM/trunk/src/UdmGme/UdmGme.cpp
==============================================================================
--- UDM/trunk/src/UdmGme/UdmGme.cpp	Fri Nov  6 08:41:43 2015	(r4363)
+++ UDM/trunk/src/UdmGme/UdmGme.cpp	Fri Nov  6 08:41:48 2015	(r4364)
@@ -2805,7 +2805,7 @@
 
 	string UdmId2GmeId(uniqueId_type udmId) {
 		char buffer[24];
-		sprintf_s(buffer, "id-%04x-%08x", udmId / 100000000 + 100, udmId % 100000000);
+		sprintf_s(buffer, "id-%04x-%08x", (unsigned int)(udmId / 100000000 + 100), (unsigned int)(udmId % 100000000));
 		return string(buffer);
 	}
 
@@ -4057,7 +4057,7 @@
 			int kindcode = id/100000000;
 			if(kindcode < OBJTYPE_MODEL || kindcode  > OBJTYPE_FOLDER)
 				return NULL;
-			sprintf(buf, "id-%04lx-%08lx", kindcode + 100 ,  id%100000000);
+			sprintf(buf, "id-%04lx-%08lx", kindcode + 100, (unsigned int)(id % 100000000));
 			
 			IMgaObjectPtr obj;
 			/*