[GitHub] merlimat closed pull request #1182: Remove constexpr from C++ client

[GitBox <gi...@apache.org>]

merlimat closed pull request #1182: Remove constexpr from C++ client
URL: https://github.com/apache/incubator-pulsar/pull/1182
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/pulsar-client-cpp/lib/Murmur3_32Hash.cc b/pulsar-client-cpp/lib/Murmur3_32Hash.cc
index 136751400..ef8859056 100644
--- a/pulsar-client-cpp/lib/Murmur3_32Hash.cc
+++ b/pulsar-client-cpp/lib/Murmur3_32Hash.cc
@@ -45,6 +45,10 @@
 #else
 #endif
 
+#define MACRO_CHUNK_SIZE 4
+#define MACRO_C1 0xcc9e2d51U
+#define MACRO_C2 0x1b873593U
+
 namespace pulsar {
 
 Murmur3_32Hash::Murmur3_32Hash() : seed(0) {}
@@ -55,9 +59,9 @@ int32_t Murmur3_32Hash::makeHash(const std::string &key) {
 
 uint32_t Murmur3_32Hash::makeHash(const void *key, const int64_t len) {
     const uint8_t *data = reinterpret_cast<const uint8_t *>(key);
-    const int nblocks = len / CHUNK_SIZE;
+    const int nblocks = len / MACRO_CHUNK_SIZE;
     uint32_t h1 = seed;
-    const uint32_t *blocks = reinterpret_cast<const uint32_t *>(data + nblocks * CHUNK_SIZE);
+    const uint32_t *blocks = reinterpret_cast<const uint32_t *>(data + nblocks * MACRO_CHUNK_SIZE);
 
     for (int i = -nblocks; i != 0; i++) {
         uint32_t k1 = BYTESPWAP(blocks[i]);
@@ -67,7 +71,7 @@ uint32_t Murmur3_32Hash::makeHash(const void *key, const int64_t len) {
     }
 
     uint32_t k1 = 0;
-    switch (len - nblocks * CHUNK_SIZE) {
+    switch (len - nblocks * MACRO_CHUNK_SIZE) {
         case 3:
             k1 ^= static_cast<uint32_t>(blocks[2]) << 16;
         case 2:
@@ -94,9 +98,9 @@ uint32_t Murmur3_32Hash::fmix(uint32_t h) {
 }
 
 uint32_t Murmur3_32Hash::mixK1(uint32_t k1) {
-    k1 *= C1;
+    k1 *= MACRO_C1;
     k1 = ROTATE_LEFT(k1, 15);
-    k1 *= C2;
+    k1 *= MACRO_C2;
     return k1;
 }
 
diff --git a/pulsar-client-cpp/lib/Murmur3_32Hash.h b/pulsar-client-cpp/lib/Murmur3_32Hash.h
index 644d18647..7d67e301c 100644
--- a/pulsar-client-cpp/lib/Murmur3_32Hash.h
+++ b/pulsar-client-cpp/lib/Murmur3_32Hash.h
@@ -38,9 +38,6 @@ class Murmur3_32Hash : public Hash {
     int32_t makeHash(const std::string& key);
 
    private:
-    static constexpr int32_t CHUNK_SIZE = 4;
-    static constexpr uint32_t C1 = 0xcc9e2d51;
-    static constexpr uint32_t C2 = 0x1b873593;
     uint32_t seed;
 
     static uint32_t fmix(uint32_t h);


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services