[Mobies-commit] [commit] r4394 - in UDM/trunk: Projects/Win32/VC10/tests samples/cross_links tests/test_staticleaks

[ksmyth at svn.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Oct 13 09:39:19 2017
New Revision: 4394

Log:
Udm tests: support compilation with later Visual Studio

Modified:
   UDM/trunk/Projects/Win32/VC10/tests/cppunit.props
   UDM/trunk/samples/cross_links/cross_links.cpp
   UDM/trunk/tests/test_staticleaks/test_staticleaks.cpp

Modified: UDM/trunk/Projects/Win32/VC10/tests/cppunit.props
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/cppunit.props	Fri Oct 13 09:39:11 2017	(r4393)
+++ UDM/trunk/Projects/Win32/VC10/tests/cppunit.props	Fri Oct 13 09:39:19 2017	(r4394)
@@ -12,7 +12,7 @@
       <AdditionalIncludeDirectories>$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\lib_v100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\lib_$(PlatformToolset);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

Modified: UDM/trunk/samples/cross_links/cross_links.cpp
==============================================================================
--- UDM/trunk/samples/cross_links/cross_links.cpp	Fri Oct 13 09:39:11 2017	(r4393)
+++ UDM/trunk/samples/cross_links/cross_links.cpp	Fri Oct 13 09:39:19 2017	(r4394)
@@ -11,6 +11,7 @@
 #include "CD3.h"
 #include "CL.h"
 #include <UmlExt.h>
+#include <functional>
 
 UDM_USE_DOM
 

Modified: UDM/trunk/tests/test_staticleaks/test_staticleaks.cpp
==============================================================================
--- UDM/trunk/tests/test_staticleaks/test_staticleaks.cpp	Fri Oct 13 09:39:11 2017	(r4393)
+++ UDM/trunk/tests/test_staticleaks/test_staticleaks.cpp	Fri Oct 13 09:39:19 2017	(r4394)
@@ -1,7 +1,9 @@
 #define _CRTDBG_MAP_ALLOC
 #include <stdlib.h>
 #include <crtdbg.h>
+#if _MSC_VER < 1800
 #include <xdebug>
+#endif
 
 #include "Windows.h"