[geode-native] branch develop updated: GEODE-4427: Moving CliCallbackMethod to DistributedSystemImpl (#233)

[jbarrett]

This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/develop by this push:
     new 7b32fed  GEODE-4427: Moving CliCallbackMethod to DistributedSystemImpl 
(#233)
7b32fed is described below

commit 7b32fed6e75c67b145718d9cf76fc6c7f45d1918
Author: Blake Bender <ekalbred...@hotmail.com>
AuthorDate: Mon Mar 12 21:09:25 2018 -0700

    GEODE-4427: Moving CliCallbackMethod to DistributedSystemImpl (#233)
    
    
    
    Signed-off-by: Blake Bender <bben...@pivotal.io>
---
 clicache/src/DistributedSystem.cpp      | 2 +-
 cppcache/include/geode/Serializable.hpp | 2 --
 cppcache/src/DistributedSystemImpl.cpp  | 6 ------
 cppcache/src/DistributedSystemImpl.hpp  | 2 ++
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/clicache/src/DistributedSystem.cpp 
b/clicache/src/DistributedSystem.cpp
index 0d55bc8..7dd1859 100644
--- a/clicache/src/DistributedSystem.cpp
+++ b/clicache/src/DistributedSystem.cpp
@@ -493,7 +493,7 @@ namespace Apache
           &CliCallbackDelegate::Callback);
 
         
native::DistributedSystemImpl::registerCliCallback(System::Threading::Thread::GetDomainID(),
-                                                                          
(native::CliCallbackMethod)System::Runtime::InteropServices::
+                                                                          
(void (*)(apache::geode::client::Cache 
&cache))System::Runtime::InteropServices::
                                                                           
Marshal::GetFunctionPointerForDelegate(
                                                                           
nativeCallback).ToPointer());
       }
diff --git a/cppcache/include/geode/Serializable.hpp 
b/cppcache/include/geode/Serializable.hpp
index 16d62e8..e769c97 100644
--- a/cppcache/include/geode/Serializable.hpp
+++ b/cppcache/include/geode/Serializable.hpp
@@ -40,8 +40,6 @@ class Cache;
 class PdxSerializable;
 class Serializable;
 
-typedef void (*CliCallbackMethod)(Cache &cache);
-
 /** @brief signature of functions passed to registerType. Such functions
  * should return an empty instance of the type they represent. The instance
  * will typically be initialized immediately after creation by a call to
diff --git a/cppcache/src/DistributedSystemImpl.cpp 
b/cppcache/src/DistributedSystemImpl.cpp
index 8d44d20..cc6f573 100644
--- a/cppcache/src/DistributedSystemImpl.cpp
+++ b/cppcache/src/DistributedSystemImpl.cpp
@@ -31,15 +31,9 @@ ACE_Recursive_Thread_Mutex 
DistributedSystemImpl::m_cliCallbackLock;
 DistributedSystemImpl::DistributedSystemImpl(const char* name,
                                              DistributedSystem* implementee)
     : m_name(name == 0 ? "" : name), m_implementee(implementee) {
-  if (m_implementee->getSystemProperties().isDhOn()) {
-    // 
m_dh.initDhKeys(m_implementee->getSystemProperties()->getSecurityProperties());
-  }
 }
 
 DistributedSystemImpl::~DistributedSystemImpl() {
-  if (m_implementee->getSystemProperties().isDhOn()) {
-    // m_dh.clearDhKeys();
-  }
   LOGFINE("Destroyed DistributedSystemImpl");
 }
 
diff --git a/cppcache/src/DistributedSystemImpl.hpp 
b/cppcache/src/DistributedSystemImpl.hpp
index 254dce2..a78261a 100644
--- a/cppcache/src/DistributedSystemImpl.hpp
+++ b/cppcache/src/DistributedSystemImpl.hpp
@@ -51,6 +51,8 @@ class SystemProperties;
 
 class DistributedSystemImpl;
 
+using CliCallbackMethod = std::function<void(Cache&)>;
+
 class _GEODE_EXPORT DistributedSystemImpl {
   /**
    * @brief public methods

-- 
To stop receiving notification emails like this one, please contact
jbarr...@apache.org.