From 8a6b323feca2152d230aa93c0fa906781e6534c6 Mon Sep 17 00:00:00 2001 From: rexy712 Date: Sat, 2 May 2020 14:05:24 -0700 Subject: [PATCH] Remove explicit constructors from rjp++. Might regret this later --- rjp++/include/array.hpp | 4 ++-- rjp++/include/integral.hpp | 16 ++++++++-------- rjp++/include/object.hpp | 4 ++-- rjp++/include/rjp.hpp | 1 + rjp++/include/string_val.hpp | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/rjp++/include/array.hpp b/rjp++/include/array.hpp index c970868..f4be53b 100644 --- a/rjp++/include/array.hpp +++ b/rjp++/include/array.hpp @@ -60,8 +60,8 @@ namespace rjp{ public: using value::value; array(void); - explicit array(const value& val); - explicit array(value&& val); + array(const value& val); + array(value&& val); array(const array&) = default; array(array&&) = default; diff --git a/rjp++/include/integral.hpp b/rjp++/include/integral.hpp index a22de13..95a7d9c 100644 --- a/rjp++/include/integral.hpp +++ b/rjp++/include/integral.hpp @@ -32,8 +32,8 @@ namespace rjp{ using value::value; integer(underlying_type i); integer(void); - explicit integer(const value& val); - explicit integer(value&& val); + integer(const value& val); + integer(value&& val); integer(const value& val, underlying_type i); integer(value&& val, underlying_type i); @@ -55,8 +55,8 @@ namespace rjp{ using value::value; dfloat(underlying_type i); dfloat(void); - explicit dfloat(const value& val); - explicit dfloat(value&& val); + dfloat(const value& val); + dfloat(value&& val); dfloat(const value& val, underlying_type i); dfloat(value&& val, underlying_type i); @@ -77,8 +77,8 @@ namespace rjp{ using value::value; boolean(underlying_type i); boolean(void); - explicit boolean(const value& val); - explicit boolean(value&& val); + boolean(const value& val); + boolean(value&& val); boolean(const value& val, underlying_type i); boolean(value&& val, underlying_type i); @@ -98,8 +98,8 @@ namespace rjp{ public: using value::value; null(void); - explicit null(const value& val); - explicit null(value&& val); + null(const value& val); + null(value&& val); null(const null&) = default; null(null&&) = default; diff --git a/rjp++/include/object.hpp b/rjp++/include/object.hpp index 9a3a538..77af75d 100644 --- a/rjp++/include/object.hpp +++ b/rjp++/include/object.hpp @@ -63,8 +63,8 @@ namespace rjp{ public: using value::value; object(void); - explicit object(const value& val); - explicit object(value&& val); + object(const value& val); + object(value&& val); object(const object&) = default; object(object&&) = default; diff --git a/rjp++/include/rjp.hpp b/rjp++/include/rjp.hpp index 77d00a4..5808f18 100644 --- a/rjp++/include/rjp.hpp +++ b/rjp++/include/rjp.hpp @@ -28,5 +28,6 @@ #include #include #include +#include #endif diff --git a/rjp++/include/string_val.hpp b/rjp++/include/string_val.hpp index cd91861..99ee5b6 100644 --- a/rjp++/include/string_val.hpp +++ b/rjp++/include/string_val.hpp @@ -35,8 +35,8 @@ namespace rjp{ string_val(const rexy::string_base& str); string_val(string&& str); string_val(void); - explicit string_val(const value& val); - explicit string_val(value&& val); + string_val(const value& val); + string_val(value&& val); string_val(const value& val, const rexy::string_base& i); string_val(value&& val, const rexy::string_base& i); string_val(const value& val, string&& i);