j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use namespace std when possible. Change the name of private variable.

Browse source
This commit is contained in:
Jonathan Dumaresq 2018-12-12 16:33:25 -05:00
parent cf31193de2
commit 635a4fc344
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/nlohmann/detail/input/input_adapters.hpp
View file

@ -53,17 +53,17 @@ Input adapter for stdio file access. This adapter read only 1 byte and do not us
class file_input_adapter : public input_adapter_protocol class file_input_adapter : public input_adapter_protocol
{ {
public: public:
explicit file_input_adapter(FILE* file) noexcept explicit file_input_adapter(std::FILE* f) noexcept
: file(file) : m_file(f)
{} {}
std::char_traits<char>::int_type get_character() noexcept override std::char_traits<char>::int_type get_character() noexcept override
{ {
return fgetc(file); return std::fgetc(m_file);
} }
private: private:
/// the file pointer to read from /// the file pointer to read from
FILE* file; std::FILE* m_file;
}; };

8
single_include/nlohmann/json.hpp
View file

@ -2102,17 +2102,17 @@ Input adapter for stdio file access. This adapter read only 1 byte and do not us
class file_input_adapter : public input_adapter_protocol class file_input_adapter : public input_adapter_protocol
{ {
public: public:
explicit file_input_adapter(FILE* file) noexcept explicit file_input_adapter(std::FILE* f) noexcept
: file(file) : m_file(f)
{} {}
std::char_traits<char>::int_type get_character() noexcept override std::char_traits<char>::int_type get_character() noexcept override
{ {
return fgetc(file); return std::fgetc(m_file);
} }
private: private:
/// the file pointer to read from /// the file pointer to read from
FILE* file; std::FILE* m_file;
}; };

10
test/src/unit-testsuites.cpp
View file

@ -386,35 +386,35 @@ TEST_CASE("json.org examples")
} }
SECTION("FILE 1.json") SECTION("FILE 1.json")
{ {
std::unique_ptr<FILE, decltype(&fclose)> f(fopen("test/data/json.org/1.json", "r"), &fclose); std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen("test/data/json.org/1.json", "r"), &std::fclose);
json j; json j;
CHECK_NOTHROW(j.parse(f.get())); CHECK_NOTHROW(j.parse(f.get()));
} }
SECTION("FILE 2.json") SECTION("FILE 2.json")
{ {
std::unique_ptr<FILE, decltype(&fclose)> f(fopen("test/data/json.org/2.json", "r"), &fclose); std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen("test/data/json.org/2.json", "r"), &std::fclose);
json j; json j;
CHECK_NOTHROW(j.parse(f.get())); CHECK_NOTHROW(j.parse(f.get()));
} }
SECTION("FILE 3.json") SECTION("FILE 3.json")
{ {
std::unique_ptr<FILE, decltype(&fclose)> f(fopen("test/data/json.org/3.json", "r"), &fclose); std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen("test/data/json.org/3.json", "r"), &std::fclose);
json j; json j;
CHECK_NOTHROW(j.parse(f.get())); CHECK_NOTHROW(j.parse(f.get()));
} }
SECTION("FILE 4.json") SECTION("FILE 4.json")
{ {
std::unique_ptr<FILE, decltype(&fclose)> f(fopen("test/data/json.org/4.json", "r"), &fclose); std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen("test/data/json.org/4.json", "r"), &std::fclose);
json j; json j;
CHECK_NOTHROW(j.parse(f.get())); CHECK_NOTHROW(j.parse(f.get()));
} }
SECTION("FILE 5.json") SECTION("FILE 5.json")
{ {
std::unique_ptr<FILE, decltype(&fclose)> f(fopen("test/data/json.org/5.json", "r"), &fclose); std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen("test/data/json.org/5.json", "r"), &std::fclose);
json j; json j;
CHECK_NOTHROW(j.parse(f.get())); CHECK_NOTHROW(j.parse(f.get()));
} }