geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject geode-native git commit: GEODE-2439: Fix build breaking merge from merge conflict
Date Sat, 25 Feb 2017 05:41:30 GMT
Repository: geode-native
Updated Branches:
  refs/heads/develop 98b69468f -> 9dd03341f


GEODE-2439: Fix build breaking merge from merge conflict


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/9dd03341
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/9dd03341
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/9dd03341

Branch: refs/heads/develop
Commit: 9dd03341f3e7a4f8395bf11378f9f19fcb195fda
Parents: 98b6946
Author: David Kimura <dkimura@pivotal.io>
Authored: Fri Feb 24 17:13:13 2017 -0800
Committer: Jacob Barrett <jbarrett@pivotal.io>
Committed: Fri Feb 24 21:40:55 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/9dd03341/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/9dd03341/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
         /// <summary>
         /// return the hashcode for this key.
         /// </summary>
-        virtual System::UInt32 hashcode() const;
+        virtual System::Int32 hashcode() const;
 
         /// <summary>
         /// return true if this key matches other CacheableKey

http://git-wip-us.apache.org/repos/asf/geode-native/blob/9dd03341/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/9dd03341/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
         /// <summary>
         /// return the hashcode for this key.
         /// </summary>
-        virtual System::UInt32 hashcode() const;
+        virtual System::Int32 hashcode() const;
 
         /// <summary>
         /// return true if this key matches other CacheableKey

http://git-wip-us.apache.org/repos/asf/geode-native/blob/9dd03341/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/9dd03341/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
         /// <summary>
         /// return the hashcode for this key.
         /// </summary>
-        virtual System::UInt32 hashcode() const;
+        virtual System::Int32 hashcode() const;
 
         /// <summary>
         /// 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/9dd03341/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/9dd03341/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
         /// <summary>
         /// return the hashcode for this key.
         /// </summary>
-        virtual System::UInt32 hashcode() const;
+        virtual System::Int32 hashcode() const;
 
         /// <summary>
         /// 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/9dd03341/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/9dd03341/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
         /// <summary>
         /// return the hashcode for this key.
         /// </summary>
-        virtual System::UInt32 hashcode() const;
+        virtual System::Int32 hashcode() const;
 
         /// <summary>
         /// 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/9dd03341/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/9dd03341/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
     /// <summary>
     /// return the hashcode for this key.
     /// </summary>
-    virtual System::UInt32 hashcode( ) const;
+    virtual System::Int32 hashcode( ) const;
 
     /// <summary>
     /// Copy the string form of a key into a char* buffer for logging purposes.


Mime
View raw message