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

Fixed osx compile error.

Browse Source
This commit is contained in:
Takatoshi Kondo
2015-08-04 15:44:06 +09:00
parent d91c510d8c
commit 41f27b5d62
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/msgpack/adaptor/cpp11/array.hpp
View File

@@ -60,6 +60,14 @@ struct as_impl {
}
};
template <typename T>
struct as_impl<T, 1> {
static std::array<T, 1> as(msgpack::object const& o) {
msgpack::object* p = o.via.array.ptr;
return std::array<T, 1>{{p->as<T>()}};
}
};
template <typename T>
struct as_impl<T, 0> {
static std::array<T, 0> as(msgpack::object const&) {

5
include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
View File

@@ -37,7 +37,6 @@ namespace type {
using std::tuple_element;
using std::uses_allocator;
using std::ignore;
using std::tie;
using std::swap;
template< class... Types >
@@ -100,6 +99,10 @@ namespace type {
) {
return std::tuple_cat(std::forward<typename std::remove_reference<Tuples>::type::base>(args)...);
}
template <class... Args>
inline tuple<Args&...> tie(Args&... args) {
return tuple<Args&...>(args...);
}
} // namespace type
// --- Pack from tuple to packer stream ---