From ed9dc9475c9a039048ed24e8c138aefab87a4471 Mon Sep 17 00:00:00 2001
From: ozancansel <ozan.cansel@hazelcast.com>
Date: Fri, 30 Dec 2022 18:07:53 +0300
Subject: [PATCH] hazelcast-cpp-client: add version 5.1.0

---
 .../hazelcast-cpp-client/all/conandata.yml    |  9 +++++
 .../all/patches/gcc_11_1_0.patch              | 40 +++++++++++++++++++
 recipes/hazelcast-cpp-client/config.yml       |  2 +
 3 files changed, 51 insertions(+)
 create mode 100644 recipes/hazelcast-cpp-client/all/patches/gcc_11_1_0.patch

diff --git a/recipes/hazelcast-cpp-client/all/conandata.yml b/recipes/hazelcast-cpp-client/all/conandata.yml
index 90b1afe2d9103..ef6a536c1dc63 100644
--- a/recipes/hazelcast-cpp-client/all/conandata.yml
+++ b/recipes/hazelcast-cpp-client/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "5.1.0":
+    url: "https://github.com/hazelcast/hazelcast-cpp-client/archive/v5.1.0.tar.gz"
+    sha256: "de22ddf2c99079ed2385baa554a997b15ae17b039d6d108f68e25e1b3bbf76b6"
   "5.0.0":
     url: "https://github.com/hazelcast/hazelcast-cpp-client/archive/v5.0.0.tar.gz"
     sha256: "0df7948bc6f4d219c60f51179355599938cab5b713335c2ea48d1d38be1b69dc"
@@ -15,5 +18,11 @@ sources:
     url: "https://github.com/hazelcast/hazelcast-cpp-client/archive/v4.0.1.zip"
     sha256: "4b3c6a876ebca2a4dcf23a556d3c3d4da2284e4ce1d2bbdf335df7f86b03fd28"
 patches:
+  "5.1.0":
+    - patch_file: "patches/gcc_11_1_0.patch"
+      patch_description: "Fix for GCC-111"
+      patch_type: "portability"
   "4.1.0":
     - patch_file: "patches/gcc_4.9_5_fix.patch"
+      patch_description: "Fix for GCC-495"
+      patch_type: "portability"
diff --git a/recipes/hazelcast-cpp-client/all/patches/gcc_11_1_0.patch b/recipes/hazelcast-cpp-client/all/patches/gcc_11_1_0.patch
new file mode 100644
index 0000000000000..c286f1883f21f
--- /dev/null
+++ b/recipes/hazelcast-cpp-client/all/patches/gcc_11_1_0.patch
@@ -0,0 +1,40 @@
+diff --git a/hazelcast/include/hazelcast/client/protocol/ClientMessage.h b/hazelcast/include/hazelcast/client/protocol/ClientMessage.h
+index 462ea85b0..f2686506a 100644
+--- a/hazelcast/include/hazelcast/client/protocol/ClientMessage.h
++++ b/hazelcast/include/hazelcast/client/protocol/ClientMessage.h
+@@ -190,6 +190,9 @@ struct HAZELCAST_API is_trivial_entry_vector<
+  */
+ class HAZELCAST_API ClientMessage
+ {
++    template<typename T>
++    struct default_nullable_decoder;
++
+ public:
+     static constexpr size_t EXPECTED_DATA_BLOCK_SIZE = 1024;
+ 
+@@ -974,10 +977,8 @@ public:
+     }
+ 
+     template<typename T>
+-    boost::optional<T> get_nullable(std::function<T(ClientMessage&)> decoder =
+-                                      [](ClientMessage& msg) {
+-                                          return msg.get<T>();
+-                                      })
++    boost::optional<T> get_nullable(
++      std::function<T(ClientMessage&)> decoder = default_nullable_decoder<T>{})
+     {
+         if (next_frame_is_null_frame()) {
+             // skip next frame with null flag
+@@ -1357,6 +1358,12 @@ private:
+     static const frame_header_type BEGIN_FRAME;
+     static const frame_header_type END_FRAME;
+ 
++    template<typename T>
++    struct default_nullable_decoder
++    {
++        T operator()(ClientMessage& msg) const { return msg.get<T>(); }
++    };
++
+     template<typename T>
+     void set_primitive_vector(const std::vector<T>& values,
+                               bool is_final = false)
diff --git a/recipes/hazelcast-cpp-client/config.yml b/recipes/hazelcast-cpp-client/config.yml
index 50e0bcc183e61..6c55bb901999c 100644
--- a/recipes/hazelcast-cpp-client/config.yml
+++ b/recipes/hazelcast-cpp-client/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "5.1.0":
+    folder: all
   "5.0.0":
     folder: all
   "4.2.0":