Repository: geode-native Updated Branches: refs/heads/develop 41d826e82 -> 3daae6ed5 (forced update)
GEODE-2486: Fixes casting failure on Windows. Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/3daae6ed Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/3daae6ed Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/3daae6ed Branch: refs/heads/develop Commit: 3daae6ed588950d8609badf9494be0e3c17527b5 Parents: d4e0a84 Author: Jacob Barrett <jbarr...@pivotal.io> Authored: Wed Feb 15 19:04:55 2017 -0800 Committer: Jacob Barrett <jbarr...@pivotal.io> Committed: Wed Feb 15 19:28:51 2017 -0800 ---------------------------------------------------------------------- src/CMakeLists.txt | 6 +++--- src/cryptoimpl/SSLImpl.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode-native/blob/3daae6ed/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3229a4e..814659c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -93,10 +93,10 @@ option(ENABLE_CLANG_TIDY "Enable clang-tidy checks." false) if(ENABLE_CLANG_TIDY) find_program(CLANG_TIDY "clang-tidy") if(CLANG_TIDY) - set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY}) + set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY} -header-filter=${CMAKE_CURRENT_SOURCE_DIR}) option(ENABLE_CLANG_TIDY_FIX "Enable clang-tidy fix." false) - if(ENABLE_CLANG_TIDY) - set(CMAKE_CXX_CLANG_TIDY ${CMAKE_CXX_CLANG_TIDY} -fix -fix-errors -header-filter=${CMAKE_CURRENT_SOURCE_DIR}) + if(ENABLE_CLANG_TIDY_FIX) + set(CMAKE_CXX_CLANG_TIDY ${CMAKE_CXX_CLANG_TIDY} -fix -fix-errors) endif() else() message(SEND_ERROR "clang-tidy enabled but not found.") http://git-wip-us.apache.org/repos/asf/geode-native/blob/3daae6ed/src/cryptoimpl/SSLImpl.cpp ---------------------------------------------------------------------- diff --git a/src/cryptoimpl/SSLImpl.cpp b/src/cryptoimpl/SSLImpl.cpp index 53d0587..d478c9c 100644 --- a/src/cryptoimpl/SSLImpl.cpp +++ b/src/cryptoimpl/SSLImpl.cpp @@ -68,7 +68,7 @@ SSLImpl::SSLImpl(ACE_SOCKET sock, const char *pubkeyfile, SSLImpl::s_initialized = true; } m_io = new ACE_SSL_SOCK_Stream(); - m_io->set_handle(sock); + m_io->set_handle(reinterpret_cast<ACE_HANDLE>(sock)); } SSLImpl::~SSLImpl() {
