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

Renamed from ct to container_type.

Browse Source
This commit is contained in:
Takatoshi Kondo 2014-03-31 10:56:36 +09:00
parent 862905742f
commit cb9eed8ccc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/msgpack/unpack.hpp
View File

@ -171,14 +171,14 @@ public:
size_t count() const { return count_; } size_t count() const { return count_; }
void set_count(size_t count) { count_ = count; } void set_count(size_t count) { count_ = count; }
size_t decl_count() { return --count_; } size_t decl_count() { return --count_; }
unsigned int ct() const { return ct_; } unsigned int container_type() const { return container_type_; }
void set_ct(unsigned int ct) { ct_ = ct; } void set_container_type(unsigned int container_type) { container_type_ = container_type; }
object const& map_key() const { return map_key_; } object const& map_key() const { return map_key_; }
void set_map_key(object const& map_key) { map_key_ = map_key; } void set_map_key(object const& map_key) { map_key_ = map_key; }
private: private:
object obj_; object obj_;
size_t count_; size_t count_;
unsigned int ct_; unsigned int container_type_;
object map_key_; object map_key_;
}; };
@ -597,7 +597,7 @@ private:
template <typename T, typename Func> template <typename T, typename Func>
int push_aggregate( int push_aggregate(
Func const& f, Func const& f,
unsigned int ct, unsigned int container_type,
object& obj, object& obj,
const char* load_pos, const char* load_pos,
size_t& off) { size_t& off) {
@ -609,7 +609,7 @@ private:
if (ret != 0) return ret; if (ret != 0) return ret;
} }
else { else {
stack_[top_].set_ct(ct); stack_[top_].set_container_type(container_type);
stack_[top_].set_count(load<T>(load_pos)); stack_[top_].set_count(load<T>(load_pos));
++top_; ++top_;
cs_ = CS_HEADER; cs_ = CS_HEADER;
@ -631,7 +631,7 @@ private:
} }
stack_idx_ = top_ - 1; stack_idx_ = top_ - 1;
unpack_stack* sp = &stack_[stack_idx_]; unpack_stack* sp = &stack_[stack_idx_];
switch(sp->ct()) { switch(sp->container_type()) {
case CT_ARRAY_ITEM: case CT_ARRAY_ITEM:
unpack_array_item(sp->obj(), obj); unpack_array_item(sp->obj(), obj);
if(sp->decl_count() == 0) { if(sp->decl_count() == 0) {
@ -645,7 +645,7 @@ private:
break; break;
case CT_MAP_KEY: case CT_MAP_KEY:
sp->set_map_key(obj); sp->set_map_key(obj);
sp->set_ct(CT_MAP_VALUE); sp->set_container_type(CT_MAP_VALUE);
finish = true; finish = true;
break; break;
case CT_MAP_VALUE: case CT_MAP_VALUE:
@ -656,7 +656,7 @@ private:
/*printf("stack pop %d\n", top_);*/ /*printf("stack pop %d\n", top_);*/
} }
else { else {
sp->set_ct(CT_MAP_KEY); sp->set_container_type(CT_MAP_KEY);
finish = true; finish = true;
} }
break; break;