diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index df717ff..3452c59 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -335,7 +335,6 @@ int main(int argc, const char* argv[]) { std::cerr << "Unhandled exception:" << std::endl << e.what() << std::endl; return 1; } - return 0; } #if defined(__GNUC__) diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp index 1317501..0872ff5 100644 --- a/src/lib_json/json_value.cpp +++ b/src/lib_json/json_value.cpp @@ -52,7 +52,7 @@ template static std::unique_ptr cloneUnique(const std::unique_ptr& p) { std::unique_ptr r; if (p) { - r = std::make_unique(*p); + r = std::unique_ptr(new T(*p)); } return r; } @@ -840,6 +840,7 @@ bool Value::isConvertibleTo(ValueType other) const { (type() == realValue && InRange(value_.real_, 0, maxUInt)) || type() == booleanValue || type() == nullValue; case realValue: + return isNumeric() || type() == booleanValue || type() == nullValue; case booleanValue: return isNumeric() || type() == booleanValue || type() == nullValue; case stringValue: @@ -1239,7 +1240,7 @@ Value::Members Value::getMemberNames() const { ObjectValues::const_iterator it = value_.map_->begin(); ObjectValues::const_iterator itEnd = value_.map_->end(); for (; it != itEnd; ++it) { - members.emplace_back(String((*it).first.data(), (*it).first.length())); + members.push_back(String((*it).first.data(), (*it).first.length())); } return members; } @@ -1396,7 +1397,7 @@ String Value::Comments::get(CommentPlacement slot) const { void Value::Comments::set(CommentPlacement slot, String comment) { if (!ptr_) { - ptr_ = std::make_unique(); + ptr_ = std::unique_ptr(new Array()); } // check comments array boundry. if (slot < CommentPlacement::numberOfCommentPlacement) { @@ -1548,7 +1549,7 @@ void Path::makePath(const String& path, const InArgs& in) { const char* beginName = current; while (current != end && !strchr("[.", *current)) ++current; - args_.emplace_back(String(beginName, current)); + args_.push_back(String(beginName, current)); } } } diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp index 9b94e5f..991c247 100644 --- a/src/test_lib_json/main.cpp +++ b/src/test_lib_json/main.cpp @@ -2732,11 +2732,12 @@ JSONTEST_FIXTURE_LOCAL(StreamWriterTest, escapeTabCharacterWindows) { struct ReaderTest : JsonTest::TestCase { void setStrictMode() { - reader = std::make_unique(Json::Features{}.strictMode()); + reader = std::unique_ptr( + new Json::Reader(Json::Features{}.strictMode())); } void setFeatures(Json::Features& features) { - reader = std::make_unique(features); + reader = std::unique_ptr(new Json::Reader(features)); } void checkStructuredErrors(