diff options
| author | Stephen D. Huston <shuston@apache.org> | 2015-02-24 17:07:39 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2015-02-24 17:07:39 +0000 |
| commit | ba21d36ab3d8b9fcfe06d1df14b3707af8d53ecd (patch) | |
| tree | c9f6c3797fffda2e81c1b82010840b35016e9714 | |
| parent | f7b83a7166dc9ec08dda81b5caf75865552867cb (diff) | |
| download | qpid-python-ba21d36ab3d8b9fcfe06d1df14b3707af8d53ecd.tar.gz | |
Merge r1661450 changes (size_t detect) into 0.32 as approved in QPID-6312
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662027 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/config.h.cmake | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/Options.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 8263534614..3de2cc9b06 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -42,7 +42,7 @@ include(CheckIncludeFiles) include(CheckIncludeFileCXX) include(CheckLibraryExists) include(CheckSymbolExists) -include(CheckSizeTNativeType) +include(CheckSizetDistinct) find_package(PkgConfig) find_package(Ruby) @@ -351,7 +351,7 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) mark_as_advanced(QPID_POLLER) endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) -check_size_t_native_type (QPID_SIZE_T_NATIVE) +check_size_t_distinct (QPID_SIZE_T_DISTINCT) option(BUILD_SASL "Build with Cyrus SASL support" ${SASL_FOUND}) if (BUILD_SASL) diff --git a/qpid/cpp/src/config.h.cmake b/qpid/cpp/src/config.h.cmake index 478b369eb6..ffde86ffa5 100644 --- a/qpid/cpp/src/config.h.cmake +++ b/qpid/cpp/src/config.h.cmake @@ -56,7 +56,7 @@ #cmakedefine HAVE_SYS_SDT_H ${HAVE_SYS_SDT_H} #cmakedefine HAVE_LOG_AUTHPRIV #cmakedefine HAVE_LOG_FTP -#cmakedefine QPID_SIZE_T_NATIVE +#cmakedefine QPID_SIZE_T_DISTINCT #cmakedefine HAVE_PROTON_TRACER #cmakedefine USE_PROTON_TRANSPORT_CONDITION #cmakedefine HAVE_PROTON_EVENTS diff --git a/qpid/cpp/src/qpid/Options.cpp b/qpid/cpp/src/qpid/Options.cpp index 5ca91e6bd4..0021afc574 100644 --- a/qpid/cpp/src/qpid/Options.cpp +++ b/qpid/cpp/src/qpid/Options.cpp @@ -146,7 +146,7 @@ template QPID_COMMON_EXTERN po::value_semantic* create_value(int64_t& val, const template QPID_COMMON_EXTERN po::value_semantic* create_value(uint16_t& val, const std::string& arg); template QPID_COMMON_EXTERN po::value_semantic* create_value(uint32_t& val, const std::string& arg); template QPID_COMMON_EXTERN po::value_semantic* create_value(uint64_t& val, const std::string& arg); -#ifdef QPID_SIZE_T_NATIVE +#ifdef QPID_SIZE_T_DISTINCT template QPID_COMMON_EXTERN po::value_semantic* create_value(size_t& val, const std::string& arg); #endif template QPID_COMMON_EXTERN po::value_semantic* create_value(double& val, const std::string& arg); |