ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/evpp/fix-rapidjson-1-1.patch

   1 diff --git a/3rdparty/libhashkit/crc32.c b/3rdparty/libhashkit/crc32.c
   2 index 6db0478..ff34194 100644
   3 --- a/3rdparty/libhashkit/crc32.c
   4 +++ b/3rdparty/libhashkit/crc32.c
   5 @@ -73,7 +73,7 @@ static const uint32_t crc32tab[256] = {
   6    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
   7  };
   8
   9 -uint32_t hashkit_crc32(const char *key, size_t key_length, void *context __attribute__((unused)))
  10 +uint32_t hashkit_crc32(const char *key, size_t key_length, void * context)
  11  {
  12    uint64_t x;
  13    uint32_t crc= UINT32_MAX;
  14 diff --git a/3rdparty/libhashkit/fnv.c b/3rdparty/libhashkit/fnv.c
  15 index ee3754d..d79fe39 100644
  16 --- a/3rdparty/libhashkit/fnv.c
  17 +++ b/3rdparty/libhashkit/fnv.c
  18 @@ -14,7 +14,7 @@ static uint64_t FNV_64_PRIME= UINT64_C(0x100000001b3);
  19  static uint32_t FNV_32_INIT= 2166136261UL;
  20  static uint32_t FNV_32_PRIME= 16777619;
  21
  22 -uint32_t hashkit_fnv1_64(const char *key, size_t key_length, void *context __attribute__((unused)))
  23 +uint32_t hashkit_fnv1_64(const char *key, size_t key_length, void * context)
  24  {
  25    /* Thanks to pierre@demartines.com for the pointer */
  26    uint64_t hash= FNV_64_INIT;
  27 @@ -28,7 +28,7 @@ uint32_t hashkit_fnv1_64(const char *key, size_t key_length, void *context __att
  28    return (uint32_t)hash;
  29  }
  30
  31 -uint32_t hashkit_fnv1a_64(const char *key, size_t key_length, void *context __attribute__((unused)))
  32 +uint32_t hashkit_fnv1a_64(const char *key, size_t key_length, void * context)
  33  {
  34    uint32_t hash= (uint32_t) FNV_64_INIT;
  35
  36 @@ -42,7 +42,7 @@ uint32_t hashkit_fnv1a_64(const char *key, size_t key_length, void *context __at
  37    return hash;
  38  }
  39
  40 -uint32_t hashkit_fnv1_32(const char *key, size_t key_length, void *context __attribute__((unused)))
  41 +uint32_t hashkit_fnv1_32(const char *key, size_t key_length, void * context)
  42  {
  43    uint32_t hash= FNV_32_INIT;
  44
  45 @@ -56,7 +56,7 @@ uint32_t hashkit_fnv1_32(const char *key, size_t key_length, void *context __att
  46    return hash;
  47  }
  48
  49 -uint32_t hashkit_fnv1a_32(const char *key, size_t key_length, void *context __attribute__((unused)))
  50 +uint32_t hashkit_fnv1a_32(const char *key, size_t key_length, void * context)
  51  {
  52    uint32_t hash= FNV_32_INIT;
  53
  54 diff --git a/3rdparty/libhashkit/hsieh.c b/3rdparty/libhashkit/hsieh.c
  55 index ba46ed2..c3e9a38 100644
  56 --- a/3rdparty/libhashkit/hsieh.c
  57 +++ b/3rdparty/libhashkit/hsieh.c
  58 @@ -17,7 +17,7 @@
  59                        +(uint32_t)(((const uint8_t *)(d))[0]) )
  60  #endif
  61
  62 -uint32_t hashkit_hsieh(const char *key, size_t key_length, void *context __attribute__((unused)))
  63 +uint32_t hashkit_hsieh(const char *key, size_t key_length, void * context)
  64  {
  65    uint32_t hash = 0, tmp;
  66    int rem;
  67 diff --git a/3rdparty/libhashkit/jenkins.c b/3rdparty/libhashkit/jenkins.c
  68 index b684d7a..2b59714 100644
  69 --- a/3rdparty/libhashkit/jenkins.c
  70 +++ b/3rdparty/libhashkit/jenkins.c
  71 @@ -56,7 +56,7 @@ use a bitmask.  For example, if you need only 10 bits, do
  72  In which case, the hash table should have hashsize(10) elements.
  73  */
  74
  75 -uint32_t hashkit_jenkins(const char *key, size_t length, void *context __attribute__((unused)))
  76 +uint32_t hashkit_jenkins(const char *key, size_t length, void * context)
  77  {
  78    uint32_t a,b,c;                                          /* internal state */
  79    union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
  80 diff --git a/3rdparty/libhashkit/md5.c b/3rdparty/libhashkit/md5.c
  81 index 7371c6d..0e3181b 100644
  82 --- a/3rdparty/libhashkit/md5.c
  83 +++ b/3rdparty/libhashkit/md5.c
  84 @@ -352,7 +352,7 @@ unsigned int len)
  85     (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
  86  }
  87
  88 -uint32_t hashkit_md5(const char *key, size_t key_length, void *context __attribute__((unused)))
  89 +uint32_t hashkit_md5(const char *key, size_t key_length, void * context)
  90  {
  91    unsigned char results[16];
  92
  93 diff --git a/3rdparty/libhashkit/murmur.c b/3rdparty/libhashkit/murmur.c
  94 index a18ac40..9e55eec 100644
  95 --- a/3rdparty/libhashkit/murmur.c
  96 +++ b/3rdparty/libhashkit/murmur.c
  97 @@ -17,7 +17,7 @@
  98
  99  #include "common.h"
 100
 101 -uint32_t hashkit_murmur(const char *key, size_t length, void *context __attribute__((unused)))
 102 +uint32_t hashkit_murmur(const char *key, size_t length, void * context)
 103  {
 104    /*
 105      'm' and 'r' are mixing constants generated offline.  They're not
 106 diff --git a/3rdparty/libhashkit/one_at_a_time.c b/3rdparty/libhashkit/one_at_a_time.c
 107 index 579d044..539861c 100644
 108 --- a/3rdparty/libhashkit/one_at_a_time.c
 109 +++ b/3rdparty/libhashkit/one_at_a_time.c
 110 @@ -13,7 +13,7 @@ http://en.wikipedia.org/wiki/Jenkins_hash_function
 111
 112  #include "common.h"
 113
 114 -uint32_t hashkit_one_at_a_time(const char *key, size_t key_length, void *context __attribute__((unused)))
 115 +uint32_t hashkit_one_at_a_time(const char *key, size_t key_length, void * context)
 116  {
 117    const char *ptr= key;
 118    uint32_t value= 0;
 119 diff --git a/3rdparty/libhashkit/strerror.c b/3rdparty/libhashkit/strerror.c
 120 index 270fa21..7446782 100644
 121 --- a/3rdparty/libhashkit/strerror.c
 122 +++ b/3rdparty/libhashkit/strerror.c
 123 @@ -8,7 +8,7 @@
 124
 125  #include "common.h"
 126
 127 -const char *hashkit_strerror(hashkit_st *ptr __attribute__((unused)), hashkit_return_t rc)
 128 +const char *hashkit_strerror(hashkit_st *ptr, hashkit_return_t rc)
 129  {
 130    switch (rc)
 131    {
 132 diff --git a/apps/evnsq/option.cc b/apps/evnsq/option.cc
 133 index e2128f5..0248ace 100644
 134 --- a/apps/evnsq/option.cc
 135 +++ b/apps/evnsq/option.cc
 136 @@ -21,14 +21,14 @@ std::string Option::ToJSON() const {
 137      doc.AddMember("write_timeout", rapidjson::Value(int64_t(write_timeout.Milliseconds())), doc.GetAllocator());
 138      doc.AddMember("msg_timeout", rapidjson::Value(int64_t(msg_timeout.Milliseconds())), doc.GetAllocator());
 139
 140 -    doc.AddMember("client_id", rapidjson::Value(client_id, doc.GetAllocator()), doc.GetAllocator());
 141 -    doc.AddMember("hostname", rapidjson::Value(hostname, doc.GetAllocator()), doc.GetAllocator());
 142 -    doc.AddMember("user_agent", rapidjson::Value(user_agent, doc.GetAllocator()), doc.GetAllocator());
 143 +    doc.AddMember("client_id", rapidjson::Value(client_id.data(), client_id.size(), doc.GetAllocator()), doc.GetAllocator());
 144 +    doc.AddMember("hostname", rapidjson::Value(hostname.data(), hostname.size(), doc.GetAllocator()), doc.GetAllocator());
 145 +    doc.AddMember("user_agent", rapidjson::Value(user_agent.data(), user_agent.size(), doc.GetAllocator()), doc.GetAllocator());
 146
 147      doc.AddMember("heartbeat_interval", rapidjson::Value(int64_t(heartbeat_interval.Milliseconds())), doc.GetAllocator());
 148
 149      doc.AddMember("deflate", rapidjson::Value(false), doc.GetAllocator());
 150 -    doc.AddMember("long_id", rapidjson::Value(hostname, doc.GetAllocator()), doc.GetAllocator());
 151 +    doc.AddMember("long_id", rapidjson::Value(hostname.data(), hostname.size(), doc.GetAllocator()), doc.GetAllocator());
 152      doc.AddMember("output_buffer_size", rapidjson::Value(int64_t(16384)), doc.GetAllocator());
 153      doc.AddMember("output_buffer_timeout", rapidjson::Value(int64_t(250)), doc.GetAllocator());
 154      doc.AddMember("feature_negotiation", rapidjson::Value(feature_negotiation), doc.GetAllocator());
 155 @@ -40,3 +40,4 @@ std::string Option::ToJSON() const {
 156      return std::string(buffer.GetString(), buffer.GetSize());
 157  }
 158  }
 159 +