amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-08-25 02:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔨 small cleanup

Browse Source
This commit is contained in:
Niels Lohmann
2019-04-05 23:31:04 +02:00
parent 63fe1cbbcf
commit e65cff2a8f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -125,7 +125,7 @@ pedantic_clang:
# calling GCC with most warnings # calling GCC with most warnings
pedantic_gcc: pedantic_gcc:
$(MAKE) json_unit CXX=$(COMPILER_DIR)/g++ CXXFLAGS="-D_Atomic=volatile \ $(MAKE) json_unit CXX=$(COMPILER_DIR)/g++ CXXFLAGS=" \
-std=c++11 \ -std=c++11 \
-Waddress \ -Waddress \
-Waddress-of-packed-member \ -Waddress-of-packed-member \
test/src/unit-allocator.cpp
+3 -3
View File
@@ -69,9 +69,9 @@ TEST_CASE("bad_alloc")
namespace namespace
{ {
static bool next_construct_fails = false; bool next_construct_fails = false;
static bool next_destroy_fails = false; bool next_destroy_fails = false;
static bool next_deallocate_fails = false; bool next_deallocate_fails = false;
template<class T> template<class T>
struct my_allocator : std::allocator<T> struct my_allocator : std::allocator<T>