generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-17 03:03:24 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #987 from redboltz/refine_enabler

Browse Source 
Removed Enabler2.
This commit is contained in:
Takatoshi Kondo
2021-10-23 13:01:03 +09:00
committed by GitHub
parent 241f001d17 af9ce1b627
commit fb01067a05
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/msgpack/v3/adaptor/adaptor_base.hpp
View File

@@ -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>

2
include/msgpack/v3/adaptor/adaptor_base_decl.hpp
View File

@@ -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>

2
test/msgpack_basic.cpp
View File

@@ -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;