Merge branch 'develop' into std-prefixes

This commit is contained in:
Frank Dana
2019-10-22 21:00:27 -04:00
committed by GitHub
62 changed files with 719 additions and 756 deletions

View File

@@ -209,7 +209,7 @@ void WriterBase::SetJson(std::string value) {
if (!success)
// Raise exception
throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
throw InvalidJSON("JSON could not be parsed (or is invalid)");
try
{
@@ -219,7 +219,7 @@ void WriterBase::SetJson(std::string value) {
catch (const std::exception& e)
{
// Error parsing JSON (or missing keys)
throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");
throw InvalidJSON("JSON is invalid (missing keys or invalid data types)");
}
}