Skip to content

Commit 3e3180c

Browse files
committed
Make compatible with 32bit.
1 parent 7f13855 commit 3e3180c

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

include/tao/json/internal/asserts.hh

Lines changed: 0 additions & 21 deletions
This file was deleted.

include/tao/json/internal/value_union.hh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ namespace tao
2929
bool b;
3030
int64_t i;
3131
double d;
32-
void * v;
3332

3433
std::string s;
3534
std::vector< Value > a;

include/tao/json/value.hh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
#include "internal/value_union.hh"
1515
#include "internal/get_by_enum.hh"
16-
#include "internal/asserts.hh"
1716
#include "internal/throw.hh"
1817

1918
#include "type.hh"
@@ -904,7 +903,7 @@ namespace tao
904903
case json::type::BOOL_:
905904
case json::type::INT64:
906905
case json::type::DOUBLE:
907-
m_union.v = r.m_union.v;
906+
m_union.i = r.m_union.i;
908907
return;
909908
case json::type::STRING:
910909
new ( & m_union.s ) std::string( std::move( r.m_union.s ) );
@@ -926,7 +925,7 @@ namespace tao
926925
case json::type::BOOL_:
927926
case json::type::INT64:
928927
case json::type::DOUBLE:
929-
m_union.v = r.m_union.v;
928+
m_union.i = r.m_union.i;
930929
return;
931930
case json::type::STRING:
932931
new ( & m_union.s ) std::string( r.m_union.s );

0 commit comments

Comments
 (0)