outman/jsoncpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* revert

Browse Source
This commit is contained in:
Pave Pimenov 2020-09-08 19:29:10 +03:00
parent 32457a772e
commit b24b7cfadf
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jsontestrunner/main.cpp
View File

@ -335,7 +335,6 @@ int main(int argc, const char* argv[]) {
std::cerr << "Unhandled exception:" << std::endl << e.what() << std::endl; std::cerr << "Unhandled exception:" << std::endl << e.what() << std::endl;
return 1; return 1;
} }
return 0;
} }
#if defined(__GNUC__) #if defined(__GNUC__)

9
src/lib_json/json_value.cpp
View File

@ -52,7 +52,7 @@ template <typename T>
static std::unique_ptr<T> cloneUnique(const std::unique_ptr<T>& p) { static std::unique_ptr<T> cloneUnique(const std::unique_ptr<T>& p) {
std::unique_ptr<T> r; std::unique_ptr<T> r;
if (p) { if (p) {
r = std::make_unique<T>(*p); r = std::unique_ptr<T>(new T(*p));
} }
return r; return r;
} }
@ -840,6 +840,7 @@ bool Value::isConvertibleTo(ValueType other) const {
(type() == realValue && InRange(value_.real_, 0, maxUInt)) || (type() == realValue && InRange(value_.real_, 0, maxUInt)) ||
type() == booleanValue || type() == nullValue; type() == booleanValue || type() == nullValue;
case realValue: case realValue:
return isNumeric() || type() == booleanValue || type() == nullValue;
case booleanValue: case booleanValue:
return isNumeric() || type() == booleanValue || type() == nullValue; return isNumeric() || type() == booleanValue || type() == nullValue;
case stringValue: case stringValue:
@ -1239,7 +1240,7 @@ Value::Members Value::getMemberNames() const {
ObjectValues::const_iterator it = value_.map_->begin(); ObjectValues::const_iterator it = value_.map_->begin();
ObjectValues::const_iterator itEnd = value_.map_->end(); ObjectValues::const_iterator itEnd = value_.map_->end();
for (; it != itEnd; ++it) { 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; return members;
} }
@ -1396,7 +1397,7 @@ String Value::Comments::get(CommentPlacement slot) const {
void Value::Comments::set(CommentPlacement slot, String comment) { void Value::Comments::set(CommentPlacement slot, String comment) {
if (!ptr_) { if (!ptr_) {
ptr_ = std::make_unique<Array>(); ptr_ = std::unique_ptr<Array>(new Array());
} }
// check comments array boundry. // check comments array boundry.
if (slot < CommentPlacement::numberOfCommentPlacement) { if (slot < CommentPlacement::numberOfCommentPlacement) {
@ -1548,7 +1549,7 @@ void Path::makePath(const String& path, const InArgs& in) {
const char* beginName = current; const char* beginName = current;
while (current != end && !strchr("[.", *current)) while (current != end && !strchr("[.", *current))
++current; ++current;
args_.emplace_back(String(beginName, current)); args_.push_back(String(beginName, current));
} }
} }
} }

5
src/test_lib_json/main.cpp
View File

@ -2732,11 +2732,12 @@ JSONTEST_FIXTURE_LOCAL(StreamWriterTest, escapeTabCharacterWindows) {
struct ReaderTest : JsonTest::TestCase { struct ReaderTest : JsonTest::TestCase {
void setStrictMode() { void setStrictMode() {
reader = std::make_unique<Json::Reader>(Json::Features{}.strictMode()); reader = std::unique_ptr<Json::Reader>(
new Json::Reader(Json::Features{}.strictMode()));
} }
void setFeatures(Json::Features& features) { void setFeatures(Json::Features& features) {
reader = std::make_unique<Json::Reader>(features); reader = std::unique_ptr<Json::Reader>(new Json::Reader(features));
} }
void checkStructuredErrors( void checkStructuredErrors(