generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-15 15:16:47 +02:00
Code Issues Projects Releases Wiki Activity

clang-tidy fixes (#1033)

Browse Source 
* [clang-tidy] Replace C typedef with C++ using

Found with modernize-use-using

Added to .clang-tidy file.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

* [clang-tidy] Remove redundant member init

Found with readability-redundant-member-init

Added to .clang-tidy

* [clang-tidy] Replace C casts with C++ ones

Found with google-readability-casting

Signed-off-by: Rosen Penev <rosenp@gmail.com>

* [clang-tidy] Use default member init

Found with modernize-use-default-member-init

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-09-25 14:03:30 -07:00
committed by Jordan Bayles
parent e9ccbe0145
commit ae4dc9aa62
4 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib_json/json_reader.cpp
View File

@@ -51,7 +51,7 @@ static size_t const stackLimit_g =
namespace Json {
#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
typedef std::unique_ptr<CharReader> CharReaderPtr;
using CharReaderPtr = std::unique_ptr<CharReader>;
#else
typedef std::auto_ptr<CharReader> CharReaderPtr;
#endif
@@ -86,11 +86,10 @@ bool Reader::containsNewLine(Reader::Location begin, Reader::Location end) {
// //////////////////////////////////////////////////////////////////
Reader::Reader()
: errors_(), document_(), commentsBefore_(), features_(Features::all()) {}
: features_(Features::all()) {}
Reader::Reader(const Features& features)
: errors_(), document_(), begin_(), end_(), current_(), lastValueEnd_(),
lastValue_(), commentsBefore_(), features_(features), collectComments_() {
: features_(features) {
}
bool Reader::parse(const std::string& document,
@@ -111,7 +110,7 @@ bool Reader::parse(std::istream& is, Value& root, bool collectComments) {
// Since String is reference-counted, this at least does not
// create an extra copy.
String doc;
std::getline(is, doc, (char)EOF);
std::getline(is, doc, static_cast<char>EOF);
return parse(doc.data(), doc.data() + doc.size(), root, collectComments);
}
@@ -895,8 +894,8 @@ OurFeatures OurFeatures::all() { return {}; }
// for implementing JSON reading.
class OurReader {
public:
typedef char Char;
typedef const Char* Location;
using Char = char;
using Location = const Char *;
struct StructuredError {
ptrdiff_t offset_start;
ptrdiff_t offset_limit;
@@ -952,7 +951,7 @@ private:
Location extra_;
};
typedef std::deque<ErrorInfo> Errors;
using Errors = std::deque<ErrorInfo>;
bool readToken(Token& token);
void skipSpaces();
@@ -997,7 +996,7 @@ private:
static String normalizeEOL(Location begin, Location end);
static bool containsNewLine(Location begin, Location end);
typedef std::stack<Value*> Nodes;
using Nodes = std::stack<Value *>;
Nodes nodes_;
Errors errors_;
String document_;
@@ -1023,8 +1022,8 @@ bool OurReader::containsNewLine(OurReader::Location begin,
}
OurReader::OurReader(OurFeatures const& features)
: errors_(), document_(), begin_(), end_(), current_(), lastValueEnd_(),
lastValue_(), commentsBefore_(), features_(features), collectComments_() {
: begin_(), end_(), current_(), lastValueEnd_(),
lastValue_(), features_(features), collectComments_() {
}
bool OurReader::parse(const char* beginDoc,