From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 5 Jun 2018 22:47:36 +0000 (-0700)
Subject: Changes to build CAF with VS 2015; not applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~559
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dee74b5944132494ddb3462bfaab8aa31300cf98;p=thirdparty%2Fopen-vm-tools.git

Changes to build CAF with VS 2015; not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/common-agent/Cpp/Framework/Framework/include/BaseDefines.h b/open-vm-tools/common-agent/Cpp/Framework/Framework/include/BaseDefines.h
index 31cf47341..e8636a64f 100644
--- a/open-vm-tools/common-agent/Cpp/Framework/Framework/include/BaseDefines.h
+++ b/open-vm-tools/common-agent/Cpp/Framework/Framework/include/BaseDefines.h
@@ -2,7 +2,7 @@
  *	 Author: mdonahue
  *  Created: Jan 12, 2011
  *
- *	Copyright (C) 2011-2016 VMware, Inc.  All rights reserved. -- VMware Confidential
+ *	Copyright (C) 2011-2018 VMware, Inc.  All rights reserved. -- VMware Confidential
  */
 
 #ifndef SYS_INC_BASEDEFINES_H_
diff --git a/open-vm-tools/common-agent/Cpp/Framework/Framework/include/Exception/CCafException.h b/open-vm-tools/common-agent/Cpp/Framework/Framework/include/Exception/CCafException.h
index 11ebfb4c5..168cdd276 100644
--- a/open-vm-tools/common-agent/Cpp/Framework/Framework/include/Exception/CCafException.h
+++ b/open-vm-tools/common-agent/Cpp/Framework/Framework/include/Exception/CCafException.h
@@ -2,12 +2,19 @@
  *	 Author: mdonahue
  *  Created: Jan 13, 2011
  *
- *	Copyright (C) 2011-2016 VMware, Inc.  All rights reserved. -- VMware Confidential
+ *	Copyright (C) 2011-2018 VMware, Inc.  All rights reserved. -- VMware Confidential
  */
 
 #ifndef CCAFEXCEPTION_H_
 #define CCAFEXCEPTION_H_
 
+#ifdef WIN32
+/*
+ *  * Disable the 'std::basic_string<> needs to have dll-interface to be used by
+ *   * clients of class 'Caf::CCafException' warning.
+ *    */
+#pragma warning(disable : 4251)
+#endif
 
 #include "ICafObject.h"
 
diff --git a/open-vm-tools/common-agent/Cpp/Framework/Framework/include/Memory/DynamicArray/TDynamicArray.h b/open-vm-tools/common-agent/Cpp/Framework/Framework/include/Memory/DynamicArray/TDynamicArray.h
index 5683bab2d..941db14c9 100644
--- a/open-vm-tools/common-agent/Cpp/Framework/Framework/include/Memory/DynamicArray/TDynamicArray.h
+++ b/open-vm-tools/common-agent/Cpp/Framework/Framework/include/Memory/DynamicArray/TDynamicArray.h
@@ -35,13 +35,17 @@
 //
 //  Created: Wednesday, August 07, 2002 2:27:39 PM
 //  
-//	Copyright (C) 2011-2016 VMware, Inc.  All rights reserved. -- VMware Confidential
+//	Copyright (C) 2011-2018 VMware, Inc.  All rights reserved. -- VMware Confidential
 //	-- VMware Confidential
 //  
 //////////////////////////////////////////////////////////////////////////////
 #ifndef _TDynamicArray_H_
 #define _TDynamicArray_H_
 
+#ifdef WIN32
+#pragma warning( disable : 4244 ) //Disabling unnecessary conversion warning
+#endif
+
 #include <string.h>
 #include "Exception/CCafException.h"
 
@@ -906,7 +910,7 @@ private:
 		_sentinelBits = reinterpret_cast<const uint64>(_data)
 			^ gs_ulDynamicArraySentinelBitPattern;
 #else
-		_sentinelBits = reinterpret_cast<const uint32>(_data) ^ gs_ulDynamicArraySentinelBitPattern;
+		_sentinelBits = reinterpret_cast<const uintptr_t>(_data) ^ gs_ulDynamicArraySentinelBitPattern;
 #endif
 
 		// Initialize the new buffer.
@@ -1003,7 +1007,7 @@ protected:
 			if ((_sentinelBits ^ reinterpret_cast<const uint64>(_data))
 				!= gs_ulDynamicArraySentinelBitPattern)
 #else
-				if ((_sentinelBits ^ reinterpret_cast<const uint32>(_data)) !=
+				if ((_sentinelBits ^ reinterpret_cast<const uintptr_t>(_data)) !=
 					gs_ulDynamicArraySentinelBitPattern)
 #endif
 				{
diff --git a/open-vm-tools/common-agent/Cpp/Framework/Framework/src/Common/CApplicationContext.cpp b/open-vm-tools/common-agent/Cpp/Framework/Framework/src/Common/CApplicationContext.cpp
index bd869511f..5872e0138 100644
--- a/open-vm-tools/common-agent/Cpp/Framework/Framework/src/Common/CApplicationContext.cpp
+++ b/open-vm-tools/common-agent/Cpp/Framework/Framework/src/Common/CApplicationContext.cpp
@@ -2,11 +2,11 @@
  *	 Author: bwilliams
  *  Created: Jul 2009
  *
- *	Copyright (C) 2009-2016 VMware, Inc.  All rights reserved. -- VMware Confidential
+ *	Copyright (C) 2009-2018 VMware, Inc.  All rights reserved. -- VMware Confidential
  */
 
 #include "stdafx.h"
-
+#include <iterator>
 #include "Common/IAppContext.h"
 #include "IBean.h"
 #include "Xml/XmlUtils/CXmlElement.h"
diff --git a/open-vm-tools/common-agent/Cpp/Framework/Framework/src/Integration/Core/CDocument.cpp b/open-vm-tools/common-agent/Cpp/Framework/Framework/src/Integration/Core/CDocument.cpp
index 238a3c11a..74c32262d 100644
--- a/open-vm-tools/common-agent/Cpp/Framework/Framework/src/Integration/Core/CDocument.cpp
+++ b/open-vm-tools/common-agent/Cpp/Framework/Framework/src/Integration/Core/CDocument.cpp
@@ -2,10 +2,11 @@
  *	Author: bwilliams
  *  Created: Oct 20, 2011
  *
- *	Copyright (C) 2011-2016 VMware, Inc.  All rights reserved. -- VMware Confidential
+ *	Copyright (C) 2011-2018 VMware, Inc.  All rights reserved. -- VMware Confidential
  */
 
 #include "stdafx.h"
+#include <iterator>
 
 #include "Integration/IDocument.h"
 #include "Xml/XmlUtils/CXmlElement.h"
diff --git a/open-vm-tools/common-agent/Cpp/Framework/Framework/src/Integration/Core/CIntMessage.cpp b/open-vm-tools/common-agent/Cpp/Framework/Framework/src/Integration/Core/CIntMessage.cpp
index b784cd9e6..f41522199 100644
--- a/open-vm-tools/common-agent/Cpp/Framework/Framework/src/Integration/Core/CIntMessage.cpp
+++ b/open-vm-tools/common-agent/Cpp/Framework/Framework/src/Integration/Core/CIntMessage.cpp
@@ -2,10 +2,11 @@
  *	 Author: bwilliams
  *  Created: Oct 22, 2010
  *
- *	Copyright (C) 2010-2016 VMware, Inc.  All rights reserved. -- VMware Confidential
+ *	Copyright (C) 2010-2018 VMware, Inc.  All rights reserved. -- VMware Confidential
  */
 
 #include "stdafx.h"
+#include <iterator>
 
 #include "ICafObject.h"
 #include "IVariant.h"
diff --git a/open-vm-tools/common-agent/Cpp/Framework/Subsystems/Integration/src/CRecipientListRouterInstance.cpp b/open-vm-tools/common-agent/Cpp/Framework/Subsystems/Integration/src/CRecipientListRouterInstance.cpp
index 0f1f40815..7ee648235 100644
--- a/open-vm-tools/common-agent/Cpp/Framework/Subsystems/Integration/src/CRecipientListRouterInstance.cpp
+++ b/open-vm-tools/common-agent/Cpp/Framework/Subsystems/Integration/src/CRecipientListRouterInstance.cpp
@@ -2,10 +2,11 @@
  *  Created on: Aug 9, 2012
  *      Author: mdonahue
  *
- *  Copyright (C) 2012-2016 VMware, Inc.  All rights reserved. -- VMware Confidential
+ *  Copyright (C) 2012-2018 VMware, Inc.  All rights reserved. -- VMware Confidential
  */
 
 #include "stdafx.h"
+#include <iterator>
 
 #include "Common/IAppContext.h"
 #include "IVariant.h"