Merge pull request #987 from redboltz/refine_enabler

Removed Enabler2.

Author: redboltz

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>

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>

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;