Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C1B05200C33 for ; Sat, 25 Feb 2017 06:42:09 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C057F160B79; Sat, 25 Feb 2017 05:42:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E5469160B69 for ; Sat, 25 Feb 2017 06:42:08 +0100 (CET) Received: (qmail 46299 invoked by uid 500); 25 Feb 2017 05:42:08 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 46290 invoked by uid 99); 25 Feb 2017 05:42:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Feb 2017 05:42:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B7A11DFD9E; Sat, 25 Feb 2017 05:42:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbarrett@apache.org To: commits@geode.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: geode-native git commit: GEODE-2439: Fix build breaking merge from merge conflict [Forced Update!] Date: Sat, 25 Feb 2017 05:42:07 +0000 (UTC) archived-at: Sat, 25 Feb 2017 05:42:09 -0000 Repository: geode-native Updated Branches: refs/heads/develop 9dd03341f -> 18d3795fd (forced update) GEODE-2439: Fix build breaking merge from merge conflict This closes #35. Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/18d3795f Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/18d3795f Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/18d3795f Branch: refs/heads/develop Commit: 18d3795fdb15bc2fd572e54bdf29e487a8cc03e7 Parents: 98b6946 Author: David Kimura Authored: Fri Feb 24 17:13:13 2017 -0800 Committer: Jacob Barrett Committed: Fri Feb 24 21:41:52 2017 -0800 ---------------------------------------------------------------------- src/clicache/src/impl/ManagedCacheableDelta.cpp | 2 +- src/clicache/src/impl/ManagedCacheableDelta.hpp | 2 +- src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp | 2 +- src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp | 2 +- src/clicache/src/impl/ManagedCacheableKey.cpp | 2 +- src/clicache/src/impl/ManagedCacheableKey.hpp | 2 +- src/clicache/src/impl/ManagedCacheableKeyBytes.cpp | 2 +- src/clicache/src/impl/ManagedCacheableKeyBytes.hpp | 2 +- src/clicache/src/impl/PdxManagedCacheableKey.cpp | 2 +- src/clicache/src/impl/PdxManagedCacheableKey.hpp | 2 +- src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp | 2 +- src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode-native/blob/18d3795f/src/clicache/src/impl/ManagedCacheableDelta.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableDelta.cpp b/src/clicache/src/impl/ManagedCacheableDelta.cpp index 80f54de..259198b 100644 --- a/src/clicache/src/impl/ManagedCacheableDelta.cpp +++ b/src/clicache/src/impl/ManagedCacheableDelta.cpp @@ -252,7 +252,7 @@ namespace apache } - System::UInt32 ManagedCacheableDeltaGeneric::hashcode() const + System::Int32 ManagedCacheableDeltaGeneric::hashcode() const { throw gcnew System::NotSupportedException; } http://git-wip-us.apache.org/repos/asf/geode-native/blob/18d3795f/src/clicache/src/impl/ManagedCacheableDelta.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableDelta.hpp b/src/clicache/src/impl/ManagedCacheableDelta.hpp index 6f247de..cb8e14d 100644 --- a/src/clicache/src/impl/ManagedCacheableDelta.hpp +++ b/src/clicache/src/impl/ManagedCacheableDelta.hpp @@ -136,7 +136,7 @@ namespace apache /// /// return the hashcode for this key. /// - virtual System::UInt32 hashcode() const; + virtual System::Int32 hashcode() const; /// /// return true if this key matches other CacheableKey http://git-wip-us.apache.org/repos/asf/geode-native/blob/18d3795f/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp b/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp index 2e50472..8734ac5 100644 --- a/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp +++ b/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp @@ -303,7 +303,7 @@ namespace apache return false; } - System::UInt32 ManagedCacheableDeltaBytesGeneric::hashcode() const + System::Int32 ManagedCacheableDeltaBytesGeneric::hashcode() const { throw gcnew System::NotSupportedException; } http://git-wip-us.apache.org/repos/asf/geode-native/blob/18d3795f/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp b/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp index f934fbb..aab663f 100644 --- a/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp +++ b/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp @@ -175,7 +175,7 @@ namespace apache /// /// return the hashcode for this key. /// - virtual System::UInt32 hashcode() const; + virtual System::Int32 hashcode() const; /// /// return true if this key matches other CacheableKey http://git-wip-us.apache.org/repos/asf/geode-native/blob/18d3795f/src/clicache/src/impl/ManagedCacheableKey.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableKey.cpp b/src/clicache/src/impl/ManagedCacheableKey.cpp index 040a22b..9305e7b 100644 --- a/src/clicache/src/impl/ManagedCacheableKey.cpp +++ b/src/clicache/src/impl/ManagedCacheableKey.cpp @@ -202,7 +202,7 @@ namespace apache return false; } - System::UInt32 ManagedCacheableKeyGeneric::hashcode() const + System::Int32 ManagedCacheableKeyGeneric::hashcode() const { if (m_hashcode != 0) return m_hashcode; http://git-wip-us.apache.org/repos/asf/geode-native/blob/18d3795f/src/clicache/src/impl/ManagedCacheableKey.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableKey.hpp b/src/clicache/src/impl/ManagedCacheableKey.hpp index 8d63ccd..9c7ea09 100644 --- a/src/clicache/src/impl/ManagedCacheableKey.hpp +++ b/src/clicache/src/impl/ManagedCacheableKey.hpp @@ -125,7 +125,7 @@ namespace apache /// /// return the hashcode for this key. /// - virtual System::UInt32 hashcode() const; + virtual System::Int32 hashcode() const; /// /// Copy the string form of a key into a char* buffer for logging purposes. http://git-wip-us.apache.org/repos/asf/geode-native/blob/18d3795f/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp b/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp index 7e82076..02f27e2 100644 --- a/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp +++ b/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp @@ -229,7 +229,7 @@ namespace apache return false; } - System::UInt32 ManagedCacheableKeyBytesGeneric::hashcode() const + System::Int32 ManagedCacheableKeyBytesGeneric::hashcode() const { return m_hashCode; } http://git-wip-us.apache.org/repos/asf/geode-native/blob/18d3795f/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp b/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp index 2e7d6c1..3a23a94 100644 --- a/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp +++ b/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp @@ -150,7 +150,7 @@ namespace apache /// /// return the hashcode for this key. /// - virtual System::UInt32 hashcode() const; + virtual System::Int32 hashcode() const; /// /// Copy the string form of a key into a char* buffer for logging purposes. http://git-wip-us.apache.org/repos/asf/geode-native/blob/18d3795f/src/clicache/src/impl/PdxManagedCacheableKey.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/PdxManagedCacheableKey.cpp b/src/clicache/src/impl/PdxManagedCacheableKey.cpp index 46f57c7..646329e 100644 --- a/src/clicache/src/impl/PdxManagedCacheableKey.cpp +++ b/src/clicache/src/impl/PdxManagedCacheableKey.cpp @@ -191,7 +191,7 @@ namespace apache return false; } - System::UInt32 PdxManagedCacheableKey::hashcode() const + System::Int32 PdxManagedCacheableKey::hashcode() const { if (m_hashcode != 0) return m_hashcode; http://git-wip-us.apache.org/repos/asf/geode-native/blob/18d3795f/src/clicache/src/impl/PdxManagedCacheableKey.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/PdxManagedCacheableKey.hpp b/src/clicache/src/impl/PdxManagedCacheableKey.hpp index 1034b8c..7280539 100644 --- a/src/clicache/src/impl/PdxManagedCacheableKey.hpp +++ b/src/clicache/src/impl/PdxManagedCacheableKey.hpp @@ -148,7 +148,7 @@ namespace apache /// /// return the hashcode for this key. /// - virtual System::UInt32 hashcode() const; + virtual System::Int32 hashcode() const; /// /// Copy the string form of a key into a char* buffer for logging purposes. http://git-wip-us.apache.org/repos/asf/geode-native/blob/18d3795f/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp index 8124c3e..3f619e3 100644 --- a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp +++ b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp @@ -234,7 +234,7 @@ namespace apache return false; } - System::UInt32 PdxManagedCacheableKeyBytes::hashcode() const + System::Int32 PdxManagedCacheableKeyBytes::hashcode() const { return m_hashCode; } http://git-wip-us.apache.org/repos/asf/geode-native/blob/18d3795f/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp index b2fc8c8..3c0f527 100644 --- a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp +++ b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp @@ -175,7 +175,7 @@ namespace apache /// /// return the hashcode for this key. /// - virtual System::UInt32 hashcode( ) const; + virtual System::Int32 hashcode( ) const; /// /// Copy the string form of a key into a char* buffer for logging purposes.