From 9416c7cc5c6ccbe0cf4faa65346165c93f81ee91 Mon Sep 17 00:00:00 2001
From: Takatoshi Kondo <redboltz@gmail.com>
Date: Sat, 23 Oct 2021 12:03:16 +0900
Subject: [PATCH 1/2] Removed Enabler2.

---
 include/msgpack/v3/adaptor/adaptor_base.hpp     | 17 +++++++++--------
 .../msgpack/v3/adaptor/adaptor_base_decl.hpp    |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/msgpack/v3/adaptor/adaptor_base.hpp b/include/msgpack/v3/adaptor/adaptor_base.hpp
index 180cca994..99af27794 100644
--- a/include/msgpack/v3/adaptor/adaptor_base.hpp
+++ b/include/msgpack/v3/adaptor/adaptor_base.hpp
@@ -32,14 +32,15 @@ struct pack : v2::adaptor::pack<T, Enabler> {
 };
 
 template <typename T, typename Enabler>
-struct object<
-    T,
-    Enabler,
-    typename msgpack::enable_if<
-        !msgpack::is_same<T, std::string>::value &&
-        !msgpack::is_array<T>::value
-    >::type>
-    : v2::adaptor::object<T, Enabler> {
+struct object
+    : v2::adaptor::object<
+        T,
+        typename msgpack::enable_if<
+            !msgpack::is_same<T, std::string>::value &&
+            !msgpack::is_array<T>::value,
+            Enabler
+        >::type
+      > {
 };
 
 template <typename T, typename Enabler>
diff --git a/include/msgpack/v3/adaptor/adaptor_base_decl.hpp b/include/msgpack/v3/adaptor/adaptor_base_decl.hpp
index f339f661e..12f096a43 100644
--- a/include/msgpack/v3/adaptor/adaptor_base_decl.hpp
+++ b/include/msgpack/v3/adaptor/adaptor_base_decl.hpp
@@ -30,7 +30,7 @@ struct convert;
 template <typename T, typename Enabler = void>
 struct pack;
 
-template <typename T, typename Enabler = void, typename Enabler2 = void>
+template <typename T, typename Enabler = void>
 struct object;
 
 template <typename T, typename Enabler = void>

From af9ce1b6273f9f1857ba172f28125251ef6472b0 Mon Sep 17 00:00:00 2001
From: Takatoshi Kondo <redboltz@gmail.com>
Date: Sat, 23 Oct 2021 12:17:34 +0900
Subject: [PATCH 2/2] Fixed test warning.

---
 test/msgpack_basic.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/msgpack_basic.cpp b/test/msgpack_basic.cpp
index 1009a30e1..24b2a31fc 100644
--- a/test/msgpack_basic.cpp
+++ b/test/msgpack_basic.cpp
@@ -214,7 +214,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(simple_buffer, TypeParam, IntegerToFloatingPointTe
     if (numeric_limits<integer_type>::is_signed) v.push_back(static_cast<integer_type>(-1));
     else v.push_back(2);
     for (unsigned int i = 0; i < kLoop; i++) {
-        v.push_back(rand() % 0x7FFFFF);
+        v.push_back(static_cast<integer_type>(rand() % 0x7FFFFF));
     }
     for (unsigned int i = 0; i < v.size() ; i++) {
         msgpack::sbuffer sbuf;