Skip to content

J
json
Commit 43ededf4 authored by Niels's avatar Niels
Browse files
Options

more cleanup

parent 76d3433e
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 24 deletions
src/json.hpp
View file @ 43ededf4
...@@ -506,9 +506,7 @@ class basic_json ...@@ -506,9 +506,7 @@ class basic_json
{ {
// the initializer list is a list of pairs -> create object // the initializer list is a list of pairs -> create object
m_type = value_t::object; m_type = value_t::object;
AllocatorType<object_t> alloc; m_value = value_t::object;
m_value.object = alloc.allocate(1);
alloc.construct(m_value.object);
for (auto& element : init) for (auto& element : init)
{ {
...@@ -1721,9 +1719,7 @@ class basic_json ...@@ -1721,9 +1719,7 @@ class basic_json
if (m_type == value_t::null) if (m_type == value_t::null)
{ {
m_type = value_t::array; m_type = value_t::array;
AllocatorType<array_t> alloc; m_value = value_t::array;
m_value.array = alloc.allocate(1);
alloc.construct(m_value.array);
} }
// add element to array (move semantics) // add element to array (move semantics)
...@@ -1752,9 +1748,7 @@ class basic_json ...@@ -1752,9 +1748,7 @@ class basic_json
if (m_type == value_t::null) if (m_type == value_t::null)
{ {
m_type = value_t::array; m_type = value_t::array;
AllocatorType<array_t> alloc; m_value = value_t::array;
m_value.array = alloc.allocate(1);
alloc.construct(m_value.array);
} }
// add element to array // add element to array
...@@ -1781,9 +1775,7 @@ class basic_json ...@@ -1781,9 +1775,7 @@ class basic_json
if (m_type == value_t::null) if (m_type == value_t::null)
{ {
m_type = value_t::object; m_type = value_t::object;
AllocatorType<object_t> alloc; m_value = value_t::object;
m_value.object = alloc.allocate(1);
alloc.construct(m_value.object);
} }
// add element to array // add element to array
......
src/json.hpp.re2c
View file @ 43ededf4
...@@ -506,9 +506,7 @@ class basic_json ...@@ -506,9 +506,7 @@ class basic_json
{ {
// the initializer list is a list of pairs -> create object // the initializer list is a list of pairs -> create object
m_type = value_t::object; m_type = value_t::object;
AllocatorType<object_t> alloc; m_value = value_t::object;
m_value.object = alloc.allocate(1);
alloc.construct(m_value.object);
for (auto& element : init) for (auto& element : init)
{ {
...@@ -1721,9 +1719,7 @@ class basic_json ...@@ -1721,9 +1719,7 @@ class basic_json
if (m_type == value_t::null) if (m_type == value_t::null)
{ {
m_type = value_t::array; m_type = value_t::array;
AllocatorType<array_t> alloc; m_value = value_t::array;
m_value.array = alloc.allocate(1);
alloc.construct(m_value.array);
} }
// add element to array (move semantics) // add element to array (move semantics)
...@@ -1752,9 +1748,7 @@ class basic_json ...@@ -1752,9 +1748,7 @@ class basic_json
if (m_type == value_t::null) if (m_type == value_t::null)
{ {
m_type = value_t::array; m_type = value_t::array;
AllocatorType<array_t> alloc; m_value = value_t::array;
m_value.array = alloc.allocate(1);
alloc.construct(m_value.array);
} }
// add element to array // add element to array
...@@ -1781,9 +1775,7 @@ class basic_json ...@@ -1781,9 +1775,7 @@ class basic_json
if (m_type == value_t::null) if (m_type == value_t::null)
{ {
m_type = value_t::object; m_type = value_t::object;
AllocatorType<object_t> alloc; m_value = value_t::object;
m_value.object = alloc.allocate(1);
alloc.construct(m_value.object);
} }
// add element to array // add element to array
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment