Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
nlohmann committed Oct 17, 2015
1 parent 7363237 commit 746c1a7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ I deeply appreciate the help of the following people.
- [Colin Hirsch](https://github.com/ColinH) took care of a small namespace issue.
- [Huu Nguyen](https://github.com/whoshuu) correct a variable name in the documentation.
- [Silverweed](https://github.com/silverweed) overloaded `parse()` to accept an rvalue reference.
- [dariomt](https://github.com/dariomt) fixed a subtlety in MSVC type support.

Thanks a lot for helping out!

Expand Down
2 changes: 1 addition & 1 deletion src/json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ class basic_json
private:
/// helper for exception-safe object creation
template<typename T, typename... Args>
static T* create( Args&& ... args )
static T* create(Args&& ... args)
{
AllocatorType<T> alloc;
auto deleter = [&](T * object)
Expand Down
2 changes: 1 addition & 1 deletion src/json.hpp.re2c
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ class basic_json
static T* create(Args&& ... args)
{
AllocatorType<T> alloc;
auto deleter = [&](T* object)
auto deleter = [&](T * object)
{
alloc.deallocate(object, 1);
};
Expand Down
2 changes: 1 addition & 1 deletion test/unit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9228,7 +9228,7 @@ TEST_CASE("concepts")

SECTION("CopyAssignable")
{
// STL iterators used by json::iterator don't pass this test in Debug mode
// STL iterators used by json::iterator don't pass this test in Debug mode
#if !defined(_MSC_VER) || (_ITERATOR_DEBUG_LEVEL == 0)
CHECK(std::is_nothrow_copy_assignable<json::iterator>::value);
CHECK(std::is_nothrow_copy_assignable<json::const_iterator>::value);
Expand Down

0 comments on commit 746c1a7

Please sign in to comment.