Skip to content

Commit

Permalink
run make pretty
Browse files Browse the repository at this point in the history
  • Loading branch information
Théo DELRIEU committed Jan 17, 2017
1 parent cbc6a2c commit 3843fa3
Show file tree
Hide file tree
Showing 8 changed files with 5,768 additions and 5,210 deletions.
5,930 changes: 3,224 additions & 2,706 deletions src/json.hpp

Large diffs are not rendered by default.

4,810 changes: 2,425 additions & 2,385 deletions src/json.hpp.re2c

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/src/unit-allocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ struct my_allocator : std::allocator<T>
}
else
{
::new(reinterpret_cast<void*>(p)) T(std::forward<Args>(args)...);
::new (reinterpret_cast<void*>(p)) T(std::forward<Args>(args)...);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/src/unit-constructor1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -912,7 +912,7 @@ TEST_CASE("constructors")

SECTION("array")
{
json j { {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false} , 13 };
json j { {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false}, 13 };
CHECK(j.type() == json::value_t::array);
}
}
Expand Down
8 changes: 4 additions & 4 deletions test/src/unit-conversions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,10 @@ TEST_CASE("value conversion")

SECTION("reserve is called on containers that supports it")
{
// making the call to from_json throw in order to check capacity
std::vector<float> v;
CHECK_THROWS_AS(nlohmann::from_json(j, v), std::logic_error);
CHECK(v.capacity() == j.size());
// making the call to from_json throw in order to check capacity
std::vector<float> v;
CHECK_THROWS_AS(nlohmann::from_json(j, v), std::logic_error);
CHECK(v.capacity() == j.size());
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/src/unit-noexcept.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ enum test
struct pod {};
struct pod_bis {};

void to_json(json &, pod) noexcept;
void to_json(json &, pod_bis);
void to_json(json&, pod) noexcept;
void to_json(json&, pod_bis);
void from_json(const json&, pod) noexcept;
void from_json(const json&, pod_bis);
static json j;
Expand Down
2 changes: 1 addition & 1 deletion test/src/unit-regression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ TEST_CASE("regression tests")

SECTION("pull request #71 - handle enum type")
{
enum { t = 0 , u = 1};
enum { t = 0, u = 1};
json j = json::array();
j.push_back(t);

Expand Down
Loading

0 comments on commit 3843fa3

Please sign in to comment.