From 6afe857755c510e0cc4cd39401b68cea78d7ccbe Mon Sep 17 00:00:00 2001 From: "Charles E. Rolke" Date: Thu, 4 Aug 2011 20:17:09 +0000 Subject: QPID-2643 Building QPID with Visual Studio 2010 This patch changes: List.h - add a typedef from the original post IntegerTypes.h - adds 'signed' to int_8 to avoid MSVC complaint SessionState.cpp, qpid-perftest.cpp - adds explicit boost:: to disambiguate methods recently defined by 'using std'. CMakeLists.txt - Adds a CMake option that allows user to include '#define _WIN32_WINNT=0x0502' or not. Linux users see no change. This replaces CMake code that includes a similar definition when the build system _has VS2005 installed_. Even if the Generator is VS2010 the def was added because VS2005 is installed. This in not right. Without this definition several components define _WIN32_WINNT=0x0501 to target network and system api components. Those components will still work correctly with 0x0502. Defining _WIN32_WINNT=0x0501 across the board causes a build error in cpp\qpid\store that 0x0502 avoids. This patch will move the minimum required version of Windows from WinXP to WinXP-SP3. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1153993 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/include/qpid/framing/List.h | 1 + cpp/include/qpid/sys/windows/IntegerTypes.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'cpp/include') diff --git a/cpp/include/qpid/framing/List.h b/cpp/include/qpid/framing/List.h index 417fd4bffb..681445947c 100644 --- a/cpp/include/qpid/framing/List.h +++ b/cpp/include/qpid/framing/List.h @@ -40,6 +40,7 @@ class QPID_COMMON_CLASS_EXTERN List { public: typedef boost::shared_ptr ValuePtr; + typedef ValuePtr value_type; typedef std::list Values; typedef Values::const_iterator const_iterator; typedef Values::iterator iterator; diff --git a/cpp/include/qpid/sys/windows/IntegerTypes.h b/cpp/include/qpid/sys/windows/IntegerTypes.h index fff320bc96..28b82da1a0 100755 --- a/cpp/include/qpid/sys/windows/IntegerTypes.h +++ b/cpp/include/qpid/sys/windows/IntegerTypes.h @@ -27,7 +27,7 @@ typedef short int16_t; typedef unsigned int uint32_t; typedef int int32_t; #if defined(_MSC_VER) -typedef char int8_t; +typedef signed char int8_t; typedef unsigned __int64 uint64_t; typedef __int64 int64_t; #else -- cgit v1.2.1