Repository: geode-native Updated Branches: refs/heads/develop d4e0a8447 -> 41d826e82
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/41d826e8 Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/41d826e8 Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/41d826e8 Branch: refs/heads/develop Commit: 41d826e8203c577b781f969c01313de389a2dbb3 Parents: d4e0a84 Author: Jacob Barrett <[email protected]> Authored: Wed Feb 15 19:04:55 2017 -0800 Committer: Jacob Barrett <[email protected]> Committed: Wed Feb 15 19:09:01 2017 -0800 ---------------------------------------------------------------------- src/CMakeLists.txt | 2 +- src/cryptoimpl/SSLImpl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode-native/blob/41d826e8/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3229a4e..5919564 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -95,7 +95,7 @@ if(ENABLE_CLANG_TIDY) if(CLANG_TIDY) set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY}) option(ENABLE_CLANG_TIDY_FIX "Enable clang-tidy fix." false) - if(ENABLE_CLANG_TIDY) + if(ENABLE_CLANG_TIDY_FIX) set(CMAKE_CXX_CLANG_TIDY ${CMAKE_CXX_CLANG_TIDY} -fix -fix-errors -header-filter=${CMAKE_CURRENT_SOURCE_DIR}) endif() else() http://git-wip-us.apache.org/repos/asf/geode-native/blob/41d826e8/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() {
