Author: shuston Date: Tue Feb 24 17:07:39 2015 New Revision: 1662027 URL: http://svn.apache.org/r1662027 Log: Merge r1661450 changes (size_t detect) into 0.32 as approved in QPID-6312
Modified: qpid/branches/0.32/qpid/cpp/src/ (props changed) qpid/branches/0.32/qpid/cpp/src/CMakeLists.txt (contents, props changed) qpid/branches/0.32/qpid/cpp/src/config.h.cmake qpid/branches/0.32/qpid/cpp/src/qpid/Options.cpp Propchange: qpid/branches/0.32/qpid/cpp/src/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 24 17:07:39 2015 @@ -6,3 +6,4 @@ /qpid/branches/java-network-refactor/qpid/cpp/src:805429-825319 /qpid/branches/qpid-2935/qpid/cpp/src:1061302-1072333 /qpid/branches/qpid-3346/qpid/cpp/src:1144319-1179855 +/qpid/trunk/qpid/cpp/src:1661450 Modified: qpid/branches/0.32/qpid/cpp/src/CMakeLists.txt URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/cpp/src/CMakeLists.txt?rev=1662027&r1=1662026&r2=1662027&view=diff ============================================================================== --- qpid/branches/0.32/qpid/cpp/src/CMakeLists.txt (original) +++ qpid/branches/0.32/qpid/cpp/src/CMakeLists.txt Tue Feb 24 17:07:39 2015 @@ -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 Windo 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) Propchange: qpid/branches/0.32/qpid/cpp/src/CMakeLists.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 24 17:07:39 2015 @@ -7,3 +7,4 @@ /qpid/branches/qpid-2393/qpid/cpp/src/CMakeLists.txt:1375790-1376954 /qpid/branches/qpid-2935/qpid/cpp/src/CMakeLists.txt:1061302-1072333 /qpid/branches/qpid-3346/qpid/cpp/src/CMakeLists.txt:1144319-1179855 +/qpid/trunk/qpid/cpp/src/CMakeLists.txt:1661450 Modified: qpid/branches/0.32/qpid/cpp/src/config.h.cmake URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/cpp/src/config.h.cmake?rev=1662027&r1=1662026&r2=1662027&view=diff ============================================================================== --- qpid/branches/0.32/qpid/cpp/src/config.h.cmake (original) +++ qpid/branches/0.32/qpid/cpp/src/config.h.cmake Tue Feb 24 17:07:39 2015 @@ -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 Modified: qpid/branches/0.32/qpid/cpp/src/qpid/Options.cpp URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/cpp/src/qpid/Options.cpp?rev=1662027&r1=1662026&r2=1662027&view=diff ============================================================================== --- qpid/branches/0.32/qpid/cpp/src/qpid/Options.cpp (original) +++ qpid/branches/0.32/qpid/cpp/src/qpid/Options.cpp Tue Feb 24 17:07:39 2015 @@ -146,7 +146,7 @@ template QPID_COMMON_EXTERN po::value_se 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); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org