Merge branch 'master' of ssh://rexy712.chickenkiller.com:1995/var/git/repos/rexy712/rjp

This commit is contained in:
rexy712 2020-05-16 13:47:47 -07:00
commit 924558c8c9
5 changed files with 15 additions and 14 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -30,5 +30,6 @@
#include <rjp++/value.hpp>
#include <rjp++/rjp_util.hpp>
#include <rjp++/dispatch.hpp>
#include <rjp++/parse.hpp>
#endif

View File

@ -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);