From 9cdd278f45eb796dbf8f50cd0630e784646e1354 Mon Sep 17 00:00:00 2001 From: Niels Date: Sat, 9 May 2015 15:29:20 +0200 Subject: [PATCH] overworked code for pull request #71 --- src/json.hpp | 6 +++--- src/json.hpp.re2c | 5 +++++ test/unit.cpp | 12 ++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/json.hpp b/src/json.hpp index 84cf344b7..87faa0273 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -417,10 +417,10 @@ class basic_json inline basic_json(const number_integer_t& value) : m_type(value_t::number_integer), m_value(value) {} - + /// create an int number to support enum type (implicit) - inline basic_json(int int_enum) - : m_type(value_t::number_integer), m_value((NumberIntegerType)int_enum) + inline basic_json(const int int_enum) + : m_type(value_t::number_integer), m_value(static_cast(int_enum)) {} /// create an integer number (implicit) diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index 2326cae51..f456e90f3 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -418,6 +418,11 @@ class basic_json : m_type(value_t::number_integer), m_value(value) {} + /// create an int number to support enum type (implicit) + inline basic_json(const int int_enum) + : m_type(value_t::number_integer), m_value(static_cast(int_enum)) + {} + /// create an integer number (implicit) template