Removed unneeded macro, added options to make_from_json.

Author: 5cript

parse/jsd_array.hpp

@@ -8,7 +8,7 @@ namespace JSON
 {
 	template <typename T, std::size_t N>
 	void parse(std::array<T, N>& value, std::string const& name,
-               PropertyTree const& object, ParsingOptions const& options = DEFAULT_PARSER_OPTIONS)
+               PropertyTree const& object, ParsingOptions const& options = {})
 	{
 		try
 		{

parse/jsd_atomic.hpp

@@ -7,7 +7,7 @@ namespace JSON
 {
 	template <typename T>
 	void parse(std::atomic<T>& value, std::string const& name,
-               PropertyTree const& object, ParsingOptions const& options = DEFAULT_PARSER_OPTIONS)
+               PropertyTree const& object, ParsingOptions const& options = {})
 	{
 		try
 		{

parse/jsd_container.hpp

@@ -6,7 +6,7 @@ namespace JSON
 {
 	template <typename T, template <typename, class = std::allocator <T> > class ContainerT>
 	void parse(ContainerT<T>& value, std::string const& name,
-               PropertyTree const& object, ParsingOptions const& options = DEFAULT_PARSER_OPTIONS)
+               PropertyTree const& object, ParsingOptions const& options = {})
 	{
 		try
 		{

parse/jsd_convenience.hpp

@@ -7,37 +7,37 @@
 namespace JSON
 {
 	template <typename T>
-    void try_parse(T& obj, std::string const& name, PropertyTree const& tree, ParsingOptions const& options = DEFAULT_PARSER_OPTIONS,
+    void try_parse(T& obj, std::string const& name, PropertyTree const& tree, ParsingOptions const& options = {},
                    typename std::enable_if <Internal::can_parse<T>::value, void>::type* = nullptr)
     {
         parse(obj, name, tree, options);
     }
 
     template <typename T>
-    void try_parse(T&, std::string const&, PropertyTree const&, ParsingOptions const& = DEFAULT_PARSER_OPTIONS,
+    void try_parse(T&, std::string const&, PropertyTree const&, ParsingOptions const& = {},
                    typename std::enable_if <!Internal::can_parse<T>::value, int>::type* = nullptr)
     {
         static_assert (Internal::can_parse<T>::value, "the object you try to parse has no applicable interface");
     }
 
     template <typename T>
-    T make_from_json(std::istream&& stream)
+    T make_from_json(std::istream&& stream, ParsingOptions const& = {})
     {
         T res;
         JSON::parse(res, "", JSON::parse_json(stream));
         return res;
     }
 
     template <typename T>
-    T make_from_json(std::istream& stream)
+    T make_from_json(std::istream& stream, ParsingOptions const& = {})
     {
         T res;
         JSON::parse(res, "", JSON::parse_json(stream));
         return res;
     }
 
     template <typename T>
-    T make_from_json(std::string const& str)
+    T make_from_json(std::string const& str, ParsingOptions const& = {})
     {
         T res;
         JSON::parse(res, "", JSON::parse_json(str));

parse/jsd_enum.hpp

@@ -9,7 +9,7 @@ namespace JSON
 {
     template <typename T>
 	void parse(T& value, std::string const& name,
-			   PropertyTree const& object, ParsingOptions const& options = DEFAULT_PARSER_OPTIONS,
+			   PropertyTree const& object, ParsingOptions const& options = {},
 			   typename std::enable_if<std::is_enum<T>::value>::type* = nullptr)
     {
         try

parse/jsd_fundamental.hpp

@@ -10,7 +10,7 @@ namespace JSON
                                               && !std::is_enum<T>::value         >::type
 			 >
 	void parse(T& value, std::string const& name,
-			   PropertyTree const& object, ParsingOptions const& options = DEFAULT_PARSER_OPTIONS)
+			   PropertyTree const& object, ParsingOptions const& options = {})
 	{
 		try
 		{
@@ -27,7 +27,7 @@ namespace JSON
 	}
 
 	void parse(char& value, std::string const& name,
-               PropertyTree const& object, ParsingOptions const& options = DEFAULT_PARSER_OPTIONS);
+               PropertyTree const& object, ParsingOptions const& options = {});
     void parse(wchar_t& value, std::string const& name,
-			   PropertyTree const& object, ParsingOptions const& options = DEFAULT_PARSER_OPTIONS);
+			   PropertyTree const& object, ParsingOptions const& options = {});
 }

parse/jsd_map.hpp

@@ -7,7 +7,7 @@ namespace JSON
 {
 	template <typename ValueT, typename CompareT = std::less <ValueT>, class AllocT = std::allocator <ValueT>>
 	void parse(std::map<std::string, ValueT, CompareT, AllocT>& value, std::string const& name,
-               PropertyTree const& object, ParsingOptions const& options = DEFAULT_PARSER_OPTIONS)
+               PropertyTree const& object, ParsingOptions const& options = {})
 	{
 		try
 		{

parse/jsd_object.hpp

@@ -43,7 +43,7 @@ namespace JSON
 
 	template <typename T>
 	typename std::enable_if <Internal::isParsable<T>::value, void>::type
-	parse(T& value, std::string const& name, PropertyTree const& tree, ParsingOptions const& options = DEFAULT_PARSER_OPTIONS)
+	parse(T& value, std::string const& name, PropertyTree const& tree, ParsingOptions const& options = {})
 	{
 		value.parse(name, tree, options);
 	}

parse/jsd_optional.hpp

@@ -8,7 +8,7 @@ namespace JSON
 {
     template <typename T>
     void parse(boost::optional <T>& value, std::string const& name,
-               PropertyTree const& object, ParsingOptions const& options = DEFAULT_PARSER_OPTIONS)
+               PropertyTree const& object, ParsingOptions const& options = {})
     {
         try
         {

parse/jsd_options.cpp

@@ -2,11 +2,4 @@
 
 namespace JSON
 {
-	ParsingOptions::ParsingOptions(InvalidPropertyHandlingBehaviour invalidPropertyHandler,
-                                   InvalidPathHandlingBehaviour invalidPathHandler,
-                                   bool strings_are_binary)
-		: invalidPropertyHandler(invalidPropertyHandler)
-		, invalidPathHandler(invalidPathHandler)
-		, strings_are_binary(strings_are_binary)
-	{}
 }