diff options
| author | Charles E. Rolke <chug@apache.org> | 2011-08-04 20:17:09 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2011-08-04 20:17:09 +0000 |
| commit | e95be9c27959221fce9d501eab220be81d786983 (patch) | |
| tree | 6e6f74a5f607730b7b4738a11ab218ef2d510848 /qpid/cpp/include | |
| parent | 427d1f82fd7ee9d6f4ad573330c85bd2fd30547d (diff) | |
| download | qpid-python-e95be9c27959221fce9d501eab220be81d786983.tar.gz | |
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@1153993 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/include')
| -rw-r--r-- | qpid/cpp/include/qpid/framing/List.h | 1 | ||||
| -rwxr-xr-x | qpid/cpp/include/qpid/sys/windows/IntegerTypes.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/include/qpid/framing/List.h b/qpid/cpp/include/qpid/framing/List.h index 417fd4bffb..681445947c 100644 --- a/qpid/cpp/include/qpid/framing/List.h +++ b/qpid/cpp/include/qpid/framing/List.h @@ -40,6 +40,7 @@ class QPID_COMMON_CLASS_EXTERN List { public: typedef boost::shared_ptr<FieldValue> ValuePtr; + typedef ValuePtr value_type; typedef std::list<ValuePtr> Values; typedef Values::const_iterator const_iterator; typedef Values::iterator iterator; diff --git a/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h b/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h index fff320bc96..28b82da1a0 100755 --- a/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h +++ b/qpid/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 |