geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [geode-native] branch develop updated: GEODE-3288: Fixes compilation on Solaris.
Date Tue, 12 Dec 2017 19:41:13 GMT
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 0e85163  GEODE-3288: Fixes compilation on Solaris.
0e85163 is described below

commit 0e851635a45ed9ff1a5421cc3ea78a22f875635f
Author: Jacob Barrett <jbarrett@pivotal.io>
AuthorDate: Tue Dec 12 19:40:34 2017 +0000

    GEODE-3288: Fixes compilation on Solaris.
    
    - Fixes incorrect template type matching.
---
 cppcache/src/CacheableString.cpp | 2 +-
 cppcache/src/util/functional.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cppcache/src/CacheableString.cpp b/cppcache/src/CacheableString.cpp
index ac0e7ec..2cce38f 100644
--- a/cppcache/src/CacheableString.cpp
+++ b/cppcache/src/CacheableString.cpp
@@ -125,7 +125,7 @@ bool CacheableString::operator==(const CacheableKey& other) const
{
 
 int32_t CacheableString::hashcode() const {
   if (m_hashcode == 0) {
-    m_hashcode = geode_hash<decltype(m_str)>{}(m_str);
+    m_hashcode = geode_hash<std::string>{}(m_str);
   }
   return m_hashcode;
 }
diff --git a/cppcache/src/util/functional.hpp b/cppcache/src/util/functional.hpp
index 3e4cfc5..e5fee78 100644
--- a/cppcache/src/util/functional.hpp
+++ b/cppcache/src/util/functional.hpp
@@ -82,7 +82,7 @@ struct dereference_equal_to<_T*> : std::equal_to<_T*> {
  */
 template <class _T>
 struct geode_hash {
-  typedef _T* argument_type;
+  typedef _T argument_type;
   int32_t operator()(const argument_type& val);
 };
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <commits@geode.apache.org>'].

Mime
View raw message