admin/msgpack-msgpack-c
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c synced 2026-06-08 16:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modified the parameter of object::convert() from pointer to reference.

Browse Source
This commit is contained in:
Takatoshi Kondo
2013-09-05 10:17:45 +09:00
parent 1fb707f93f
commit 415b14335f
16 changed files with 78 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/msgpack/object.hpp
+11 -2
View File
@@ -85,9 +85,12 @@ struct object {
template <typename T>
T as() const;
template <typename T>
void convert(T& v) const;
template <typename T>
void convert(T* v) const;
object();
object(msgpack_object o);
@@ -302,17 +305,23 @@ inline object::implicit_type object::convert() const
return implicit_type(*this);
}
template <typename T>
inline void object::convert(T& v) const
{
*this >> v;
}
template <typename T>
inline void object::convert(T* v) const
{
*this >> *v;
convert(*v);
}
template <typename T>
inline T object::as() const
{
T v;
convert(&v);
convert(v);
return v;
}
src/msgpack/type/define.hpp.erb
+1 -1
View File
@@ -111,7 +111,7 @@ struct define<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
msgpack::object *ptr = o.via.array.ptr;
switch(size) {
default:<%(i).downto(0) {|j|%>
case <%=j+1%>: ptr[<%=j%>].convert(&a<%=j%>);<%}%>
case <%=j+1%>: ptr[<%=j%>].convert(a<%=j%>);<%}%>
}
}
}
src/msgpack/type/deque.hpp
+1 -1
View File
@@ -33,7 +33,7 @@ inline std::deque<T>& operator>> (object o, std::deque<T>& v)
object* const pend = o.via.array.ptr + o.via.array.size;
typename std::deque<T>::iterator it = v.begin();
for(; p < pend; ++p, ++it) {
p->convert(&*it);
p->convert(*it);
}
return v;
}
src/msgpack/type/list.hpp
+1 -1
View File
@@ -33,7 +33,7 @@ inline std::list<T>& operator>> (object o, std::list<T>& v)
object* const pend = o.via.array.ptr + o.via.array.size;
typename std::list<T>::iterator it = v.begin();
for(; p < pend; ++p, ++it) {
p->convert(&*it);
p->convert(*it);
}
return v;
}
src/msgpack/type/map.hpp
+7 -7
View File
@@ -51,8 +51,8 @@ inline type::assoc_vector<K,V>& operator>> (object o, type::assoc_vector<K,V>& v
object_kv* const pend = o.via.map.ptr + o.via.map.size;
std::pair<K, V>* it(&v.front());
for(; p < pend; ++p, ++it) {
p->key.convert(&it->first);
p->val.convert(&it->second);
p->key.convert(it->first);
p->val.convert(it->second);
}
std::sort(v.begin(), v.end(), type::detail::pair_first_less<K,V>());
return v;
@@ -101,13 +101,13 @@ inline std::map<K, V> operator>> (object o, std::map<K, V>& v)
object_kv* const pend(o.via.map.ptr + o.via.map.size);
for(; p != pend; ++p) {
K key;
p->key.convert(&key);
p->key.convert(key);
typename std::map<K,V>::iterator it(v.lower_bound(key));
if(it != v.end() && !(key < it->first)) {
p->val.convert(&it->second);
p->val.convert(it->second);
} else {
V val;
p->val.convert(&val);
p->val.convert(val);
v.insert(it, std::pair<K,V>(key, val));
}
}
@@ -157,8 +157,8 @@ inline std::multimap<K, V> operator>> (object o, std::multimap<K, V>& v)
object_kv* const pend(o.via.map.ptr + o.via.map.size);
for(; p != pend; ++p) {
std::pair<K, V> value;
p->key.convert(&value.first);
p->val.convert(&value.second);
p->key.convert(value.first);
p->val.convert(value.second);
v.insert(value);
}
return v;
src/msgpack/type/nil.hpp
+1 -1
View File
@@ -55,7 +55,7 @@ template <>
inline void object::as<void>() const
{
msgpack::type::nil v;
convert(&v);
convert(v);
}
src/msgpack/type/pair.hpp
+2 -2
View File
@@ -29,8 +29,8 @@ inline std::pair<T1, T2>& operator>> (object o, std::pair<T1, T2>& v)
{
if(o.type != type::ARRAY) { throw type_error(); }
if(o.via.array.size != 2) { throw type_error(); }
o.via.array.ptr[0].convert(&v.first);
o.via.array.ptr[1].convert(&v.second);
o.via.array.ptr[0].convert(v.first);
o.via.array.ptr[1].convert(v.second);
return v;
}
src/msgpack/type/tr1/unordered_map.hpp
+4 -4
View File
@@ -51,8 +51,8 @@ inline MSGPACK_STD_TR1::unordered_map<K, V> operator>> (object o, MSGPACK_STD_TR
object_kv* const pend(o.via.map.ptr + o.via.map.size);
for(; p != pend; ++p) {
K key;
p->key.convert(&key);
p->val.convert(&v[key]);
p->key.convert(key);
p->val.convert(v[key]);
}
return v;
}
@@ -100,8 +100,8 @@ inline MSGPACK_STD_TR1::unordered_multimap<K, V> operator>> (object o, MSGPACK_S
object_kv* const pend(o.via.map.ptr + o.via.map.size);
for(; p != pend; ++p) {
std::pair<K, V> value;
p->key.convert(&value.first);
p->val.convert(&value.second);
p->key.convert(value.first);
p->val.convert(value.second);
v.insert(value);
}
return v;
src/msgpack/type/tuple.hpp.erb
+6 -6
View File
@@ -1,7 +1,7 @@
//
// MessagePack for C++ static resolution routine
//
// Copyright (C) 2008-2009 FURUHASHI Sadayuki
// Copyright (C) 2008-2013 FURUHASHI Sadayuki and KONDO Takatoshi
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -92,7 +92,7 @@ private:
template <>
struct tuple<> {
tuple() {}
tuple(object const& o) { o.convert(this); }
tuple(object const& o) { o.convert(*this); }
typedef tuple<> value_type;
};
<%0.upto(GENERATION_LIMIT) {|i|%>
@@ -102,7 +102,7 @@ struct tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
tuple() {}
tuple(typename tuple_type<A0>::transparent_reference _a0<%1.upto(i) {|j|%>, typename tuple_type<A<%=j%>>::transparent_reference _a<%=j%><%}%>) :
a0(_a0)<%1.upto(i) {|j|%>, a<%=j%>(_a<%=j%>)<%}%> {}
tuple(object const& o) { o.convert(this); }
tuple(object const& o) { o.convert(*this); }
template <int N> typename tuple_element<value_type, N>::reference get()
{ return tuple_element<value_type, N>(*this).get(); }
template <int N> typename const_tuple_element<value_type, N>::const_reference get() const
@@ -111,10 +111,10 @@ struct tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
A<%=j%> a<%=j%>;<%}%>
};
template <int N, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
template <int N, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
inline typename type::tuple_element<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>, N>::reference get(type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& t)
{ return t.get<N>(); }
template <int N, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
template <int N, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
inline typename type::const_tuple_element<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>, N>::const_reference get(type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> const& t)
{ return t.get<N>(); }
<%}%>
@@ -147,7 +147,7 @@ type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& operator>> (
if(o.type != type::ARRAY) { throw type_error(); }
if(o.via.array.size < <%=i+1%>) { throw type_error(); }
<%0.upto(i) {|j|%>
o.via.array.ptr[<%=j%>].convert<typename type::tuple_type<A<%=j%>>::type>(&v.template get<<%=j%>>());<%}%>
o.via.array.ptr[<%=j%>].convert<typename type::tuple_type<A<%=j%>>::type>(v.template get<<%=j%>>());<%}%>
return v;
}
<%}%>
src/msgpack/type/vector.hpp
+1 -1
View File
@@ -34,7 +34,7 @@ inline std::vector<T>& operator>> (object o, std::vector<T>& v)
object* const pend = o.via.array.ptr + o.via.array.size;
T* it = &v[0];
do {
p->convert(it);
p->convert(*it);
++p;
++it;
} while(p < pend);