Merge pull request #1187 from devsisters/json-internal-catch

[RFC] Introduce a new macro function: JSON_INTERNAL_CATCH
2018-08-14 21:56:29 +02:00 · 2018-08-14 21:56:29 +02:00 · 0e748f2f8c
commit 0e748f2f8c
parent 861ee400cc d0e60de433
4 changed files with 20 additions and 4 deletions
--- a/include/nlohmann/json.hpp
+++ b/include/nlohmann/json.hpp
@ -3437,7 +3437,7 @@ class basic_json
            {
                return ptr.get_checked(this);
            }
-            JSON_CATCH (out_of_range&)
+            JSON_INTERNAL_CATCH (out_of_range&)
            {
                return default_value;
            }
@ -7359,7 +7359,7 @@ class basic_json
                        // the "path" location must exist - use at()
                        success = (result.at(ptr) == get_value("test", "value", false));
                    }
-                    JSON_CATCH (out_of_range&)
+                    JSON_INTERNAL_CATCH (out_of_range&)
                    {
                        // ignore out of range errors: success remains false
                    }