generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-04-23 08:52:32 +02:00
Code Issues Projects Releases Wiki Activity

Fixed #417.

Browse Source 
Removed object adaptor specialization for std::string from v2.
This commit is contained in:
Takatoshi Kondo 2016-02-22 10:06:15 +09:00
parent 549c28459e
commit acf4ac01fc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/msgpack/v2/adaptor/adaptor_base.hpp
View File

@ -32,7 +32,7 @@ struct pack : v1::adaptor::pack<T, Enabler> {
}; };
template <typename T, typename Enabler> template <typename T, typename Enabler>
struct object : v1::adaptor::object<T, Enabler> { struct object<T, Enabler, typename msgpack::enable_if<!msgpack::is_same<T, std::string>::value>::type> : v1::adaptor::object<T, Enabler> {
}; };
template <typename T, typename Enabler> template <typename T, typename Enabler>

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

@ -30,7 +30,7 @@ struct convert;
template <typename T, typename Enabler = void> template <typename T, typename Enabler = void>
struct pack; struct pack;
template <typename T, typename Enabler = void> template <typename T, typename Enabler = void, typename Enabler2 = void>
struct object; struct object;
template <typename T, typename Enabler = void> template <typename T, typename Enabler = void>