saberbud/rest_rpc
1
0
Fork 0
mirror of https://github.com/qicosmos/rest_rpc.git synced 2026-08-30 09:00:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

change msgpack to 3.1.0 to remove boost dependency

Browse Source
This commit is contained in:
qicosmos
2021-06-29 23:00:52 +08:00
parent b7936d83c5
commit 98262e4b0a
472 changed files with 49491 additions and 1011 deletions
Download Patch File Download Diff File Expand all files Collapse all files
thirdparty/msgpack-c/include/msgpack/v2/parse.hpp
Vendored
+19 -19
View File
@@ -14,9 +14,7 @@
#include <cstddef>
#include <boost/assert.hpp>
#include "msgpack/unpack_define.hpp"
#include "msgpack/unpack_define.h"
#include "msgpack/parse_return.hpp"
#include "msgpack/unpack_exception.hpp"
#include "msgpack/unpack_decl.hpp"
@@ -73,27 +71,27 @@ private:
++m_current;
if (size == 0) {
if (!sv(size)) {
off = static_cast<std::size_t>(m_current - m_start);
off = m_current - m_start;
return PARSE_STOP_VISITOR;
}
if (!ev()) {
off = static_cast<std::size_t>(m_current - m_start);
off = m_current - m_start;
return PARSE_STOP_VISITOR;
}
parse_return ret = m_stack.consume(holder());
if (ret != PARSE_CONTINUE) {
off = static_cast<std::size_t>(m_current - m_start);
off = m_current - m_start;
return ret;
}
}
else {
if (!sv(size)) {
off = static_cast<std::size_t>(m_current - m_start);
off = m_current - m_start;
return PARSE_STOP_VISITOR;
}
parse_return ret = m_stack.push(holder(), sv.type(), static_cast<uint32_t>(size));
if (ret != PARSE_CONTINUE) {
off = static_cast<std::size_t>(m_current - m_start);
off = m_current - m_start;
return ret;
}
}
@@ -104,12 +102,12 @@ private:
parse_return after_visit_proc(bool visit_result, std::size_t& off) {
++m_current;
if (!visit_result) {
off = static_cast<std::size_t>(m_current - m_start);
off = m_current - m_start;
return PARSE_STOP_VISITOR;
}
parse_return ret = m_stack.consume(holder());
if (ret != PARSE_CONTINUE) {
off = static_cast<std::size_t>(m_current - m_start);
off = m_current - m_start;
}
m_cs = MSGPACK_CS_HEADER;
return ret;
@@ -167,10 +165,10 @@ private:
case MSGPACK_CT_MAP_KEY:
return visitor_holder.visitor().start_map_key() ? PARSE_CONTINUE : PARSE_STOP_VISITOR;
case MSGPACK_CT_MAP_VALUE:
BOOST_ASSERT(0);
assert(0);
return PARSE_STOP_VISITOR;
}
BOOST_ASSERT(0);
assert(0);
return PARSE_STOP_VISITOR;
}
parse_return consume(VisitorHolder& visitor_holder) {
@@ -236,15 +234,17 @@ inline void check_ext_size<4>(std::size_t size) {
template <typename VisitorHolder>
inline parse_return context<VisitorHolder>::execute(const char* data, std::size_t len, std::size_t& off)
{
BOOST_ASSERT(len >= off);
assert(len >= off);
m_start = data;
m_current = data + off;
const char* const pe = data + len;
const char* n = MSGPACK_NULLPTR;
msgpack::object obj;
if(m_current == pe) {
off = static_cast<std::size_t>(m_current - m_start);
off = m_current - m_start;
return PARSE_CONTINUE;
}
bool fixed_trail_again = false;
@@ -326,7 +326,7 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
parse_return upr = after_visit_proc(visret, off);
if (upr != PARSE_CONTINUE) return upr;
} else {
off = static_cast<std::size_t>(m_current - m_start);
off = m_current - m_start;
holder().visitor().parse_error(off - 1, off);
return PARSE_PARSE_ERROR;
}
@@ -338,7 +338,7 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
fixed_trail_again = false;
}
if(static_cast<std::size_t>(pe - m_current) < m_trail) {
off = static_cast<std::size_t>(m_current - m_start);
off = m_current - m_start;
return PARSE_CONTINUE;
}
n = m_current;
@@ -608,14 +608,14 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
if (ret != PARSE_CONTINUE) return ret;
} break;
default:
off = static_cast<std::size_t>(m_current - m_start);
holder().visitor().parse_error(static_cast<std::size_t>(n - m_start - 1), static_cast<std::size_t>(n - m_start));
off = m_current - m_start;
holder().visitor().parse_error(n - m_start - 1, n - m_start);
return PARSE_PARSE_ERROR;
}
}
} while(m_current != pe);
off = static_cast<std::size_t>(m_current - m_start);
off = m_current - m_start;
return PARSE_CONTINUE;
}