update nlohmann::json to 3.0.0

rexdf · Dec 25, 2017 · 7ec2cdc · 7ec2cdc
1 parent f48bd2d
commit 7ec2cdc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CommandTrayHost/utils.cpp b/CommandTrayHost/utils.cpp
@@ -375,9 +375,9 @@ bool json_object_has_member(const nlohmann::json& root, PCSTR query_string)
 		root.at(query_string);
 	}
 #ifdef _DEBUG
-	catch (std::out_of_range& e)
+	catch (nlohmann::json::out_of_range& e)
 #else
-	catch (std::out_of_range&)
+	catch (nlohmann::json::out_of_range&)
 #endif
 	{
 		LOGMESSAGE(L"out_of_range %S\n", e.what());

diff --git a/CommandTrayHost/utils.hpp b/CommandTrayHost/utils.hpp
@@ -25,9 +25,9 @@ bool try_read_optional_json(const nlohmann::json& root, Type& out, PCSTR query_s
 		out = root.at(query_string);
 	}
 #ifdef _DEBUG
-	catch (std::out_of_range& e)
+	catch (nlohmann::json::out_of_range& e)
 #else
-	catch (std::out_of_range&)
+	catch (nlohmann::json::out_of_range&)
 #endif
 	{
 		LOGMESSAGE(L"%S %S out_of_range %S\n", caller_fuc_name, query_string, e.what());