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

Merge pull request #59 from dkopecek/master

Browse source 
Fix compilation of json_unit with GCC 5
This commit is contained in:
Niels 2015-04-15 08:53:40 +02:00
commit 3eb1b2a756
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -13,7 +13,7 @@ clean:
# build unit tests # build unit tests
json_unit: test/unit.cpp src/json.hpp test/catch.hpp json_unit: test/unit.cpp src/json.hpp test/catch.hpp
$(CXX) -std=c++11 $(CXXFLAGS) $(FLAGS) $(CPPFLAGS) -I src -I test -Dprivate=public $< $(LDFLAGS) -o $@ $(CXX) -std=c++11 $(CXXFLAGS) $(FLAGS) $(CPPFLAGS) -I src -I test $< $(LDFLAGS) -o $@
# create scanner with re2c # create scanner with re2c
re2c: src/json.hpp.re2c re2c: src/json.hpp.re2c

7
test/unit.cpp
View file

@ -10,9 +10,6 @@
#define CATCH_CONFIG_MAIN #define CATCH_CONFIG_MAIN
#include "catch.hpp" #include "catch.hpp"
#include "json.hpp"
using nlohmann::json;
#include <array> #include <array>
#include <deque> #include <deque>
#include <forward_list> #include <forward_list>
@ -24,6 +21,10 @@ using nlohmann::json;
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>
#define private public
#include "json.hpp"
using nlohmann::json;
TEST_CASE("constructors") TEST_CASE("constructors")
{ {
SECTION("create an empty value with a given type") SECTION("create an empty value with a given type")