Renamed the classes named template_*.

Removed template_ from them because they are no longer template.
This commit is contained in:
Takatoshi Kondo 2013-10-02 17:37:09 +09:00
parent c375e14705
commit e2026c0507

View File

@ -144,7 +144,7 @@ inline void unpack_raw(unpack_user& u, const char* b, const char* p, unsigned in
} }
class template_unpack_stack { class unpack_stack {
public: public:
object const& obj() const { return obj_; } object const& obj() const { return obj_; }
object& obj() { return obj_; } object& obj() { return obj_; }
@ -230,9 +230,9 @@ inline T load(const char* n, typename msgpack::enable_if<sizeof(T) == 8>::type*
(static_cast<uint64_t>(reinterpret_cast<const uint8_t*>(n)[7]) )); (static_cast<uint64_t>(reinterpret_cast<const uint8_t*>(n)[7]) ));
} }
class template_context { class context {
public: public:
template_context():trail_(0), cs_(CS_HEADER), top_(0) context():trail_(0), cs_(CS_HEADER), top_(0)
{ {
stack_[0].set_obj(object()); stack_[0].set_obj(object());
} }
@ -272,7 +272,7 @@ public:
unsigned int trail = trail_; unsigned int trail = trail_;
object obj; object obj;
template_unpack_stack* c = nullptr; unpack_stack* c = nullptr;
if(p == pe) { if(p == pe) {
off = update_attributes(p, data, trail); off = update_attributes(p, data, trail);
@ -543,7 +543,7 @@ private:
int push_aggregate( int push_aggregate(
Func const& f, Func const& f,
unsigned int ct, unsigned int ct,
template_unpack_stack*& c, unpack_stack*& c,
object& obj, object& obj,
const char*& current, const char*& current,
const char* load_pos, const char* load_pos,
@ -583,7 +583,7 @@ private:
cs_ = CS_HEADER; cs_ = CS_HEADER;
++current; ++current;
} }
int push_item(template_unpack_stack*& c, object& obj) { int push_item(unpack_stack*& c, object& obj) {
bool finish = false; bool finish = false;
while (!finish) { while (!finish) {
if(top_ == 0) { if(top_ == 0) {
@ -627,7 +627,7 @@ private:
} }
int push_proc( int push_proc(
template_unpack_stack*& c, unpack_stack*& c,
object& obj, object& obj,
const char*& current, const char*& current,
const char* origin, const char* origin,
@ -654,7 +654,7 @@ private:
unpack_user user_; unpack_user user_;
unsigned int cs_; unsigned int cs_;
unsigned int top_; unsigned int top_;
template_unpack_stack stack_[MSGPACK_EMBED_STACK_SIZE]; unpack_stack stack_[MSGPACK_EMBED_STACK_SIZE];
}; };
} // detail } // detail
@ -794,7 +794,7 @@ private:
size_t parsed_; size_t parsed_;
zone* z_; zone* z_;
size_t initial_buffer_size_; size_t initial_buffer_size_;
detail::template_context ctx_; detail::context ctx_;
private: private:
unpacker(const unpacker&); unpacker(const unpacker&);
@ -1088,7 +1088,7 @@ unpack_imp(const char* data, size_t len, size_t* off,
return UNPACK_CONTINUE; return UNPACK_CONTINUE;
} }
detail::template_context ctx; detail::context ctx;
ctx.init(); ctx.init();
ctx.user().set_z(result_zone); ctx.user().set_z(result_zone);