mirror of
https://github.com/msgpack/msgpack-c.git
synced 2025-10-20 14:02:40 +02:00
Replaced C-style casts with C++ stype casts in C++ codes.
This commit is contained in:
@@ -26,91 +26,91 @@ namespace msgpack {
|
||||
// --- Pack ( from tuple to packer stream ---
|
||||
template <typename Stream, typename Tuple, std::size_t N>
|
||||
struct Packer {
|
||||
static void pack(
|
||||
static void pack(
|
||||
packer<Stream>& o,
|
||||
const Tuple& v) {
|
||||
Packer<Stream, Tuple, N-1>::pack(o, v);
|
||||
o.pack(type::get<N-1>(v));
|
||||
}
|
||||
Packer<Stream, Tuple, N-1>::pack(o, v);
|
||||
o.pack(type::get<N-1>(v));
|
||||
}
|
||||
};
|
||||
|
||||
template <typename Stream, typename Tuple>
|
||||
struct Packer<Stream, Tuple, 1> {
|
||||
static void pack (
|
||||
static void pack (
|
||||
packer<Stream>& o,
|
||||
const Tuple& v) {
|
||||
o.pack(type::get<0>(v));
|
||||
}
|
||||
o.pack(type::get<0>(v));
|
||||
}
|
||||
};
|
||||
|
||||
template <typename Stream, typename... Args>
|
||||
const packer<Stream>& operator<< (
|
||||
packer<Stream>& o,
|
||||
const type::tuple<Args...>& v) {
|
||||
packer<Stream>& o,
|
||||
const type::tuple<Args...>& v) {
|
||||
o.pack_array(sizeof...(Args));
|
||||
Packer<Stream, decltype(v), sizeof...(Args)>::pack(o, v);
|
||||
return o;
|
||||
Packer<Stream, decltype(v), sizeof...(Args)>::pack(o, v);
|
||||
return o;
|
||||
}
|
||||
|
||||
// --- Convert from tuple to object ---
|
||||
|
||||
template <typename Tuple, std::size_t N>
|
||||
struct Converter {
|
||||
static void convert(
|
||||
object o,
|
||||
static void convert(
|
||||
object o,
|
||||
Tuple& v) {
|
||||
Converter<Tuple, N-1>::convert(o, v);
|
||||
o.via.array.ptr[N-1].convert<typename std::remove_reference<decltype(type::get<N-1>(v))>::type>(&type::get<N-1>(v));
|
||||
}
|
||||
Converter<Tuple, N-1>::convert(o, v);
|
||||
o.via.array.ptr[N-1].convert<typename std::remove_reference<decltype(type::get<N-1>(v))>::type>(&type::get<N-1>(v));
|
||||
}
|
||||
};
|
||||
|
||||
template <typename Tuple>
|
||||
struct Converter<Tuple, 1> {
|
||||
static void convert (
|
||||
object o,
|
||||
static void convert (
|
||||
object o,
|
||||
Tuple& v) {
|
||||
o.via.array.ptr[0].convert<typename std::remove_reference<decltype(type::get<0>(v))>::type>(&type::get<0>(v));
|
||||
}
|
||||
o.via.array.ptr[0].convert<typename std::remove_reference<decltype(type::get<0>(v))>::type>(&type::get<0>(v));
|
||||
}
|
||||
};
|
||||
|
||||
template <typename... Args>
|
||||
type::tuple<Args...>& operator>> (
|
||||
object o,
|
||||
type::tuple<Args...>& v) {
|
||||
object o,
|
||||
type::tuple<Args...>& v) {
|
||||
if(o.type != type::ARRAY) { throw type_error(); }
|
||||
if(o.via.array.size < sizeof...(Args)) { throw type_error(); }
|
||||
Converter<decltype(v), sizeof...(Args)>::convert(o, v);
|
||||
return v;
|
||||
Converter<decltype(v), sizeof...(Args)>::convert(o, v);
|
||||
return v;
|
||||
}
|
||||
|
||||
// --- Convert from tuple to object with zone ---
|
||||
template <typename Tuple, std::size_t N>
|
||||
struct TupleToObjectWithZone {
|
||||
static void convert(
|
||||
static void convert(
|
||||
object::with_zone& o,
|
||||
const Tuple& v) {
|
||||
TupleToObjectWithZone<Tuple, N-1>::convert(o, v);
|
||||
o.via.array.ptr[N-1] = object(type::get<N-1>(v), o.zone);
|
||||
}
|
||||
TupleToObjectWithZone<Tuple, N-1>::convert(o, v);
|
||||
o.via.array.ptr[N-1] = object(type::get<N-1>(v), o.zone);
|
||||
}
|
||||
};
|
||||
|
||||
template <typename Tuple>
|
||||
struct TupleToObjectWithZone<Tuple, 1> {
|
||||
static void convert (
|
||||
static void convert (
|
||||
object::with_zone& o,
|
||||
const Tuple& v) {
|
||||
o.via.array.ptr[0] = object(type::get<0>(v), o.zone);
|
||||
}
|
||||
o.via.array.ptr[0] = object(type::get<0>(v), o.zone);
|
||||
}
|
||||
};
|
||||
|
||||
template <typename... Args>
|
||||
inline void operator<< (
|
||||
object::with_zone& o,
|
||||
type::tuple<Args...>& v) {
|
||||
type::tuple<Args...>& v) {
|
||||
o.type = type::ARRAY;
|
||||
o.via.array.ptr = (object*)o.zone->malloc(sizeof(object)*sizeof...(Args));
|
||||
o.via.array.ptr = static_cast<object*>(o.zone->malloc(sizeof(object)*sizeof...(Args)));
|
||||
o.via.array.size = sizeof...(Args);
|
||||
TupleToObjectWithZone<decltype(v), sizeof...(Args)>::convert(o, v);
|
||||
TupleToObjectWithZone<decltype(v), sizeof...(Args)>::convert(o, v);
|
||||
}
|
||||
|
||||
} // msgpack
|
||||
|
Reference in New Issue
Block a user