From 80913b8044d22892ab5a68e2accc635a24e8f922 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Sat, 7 Feb 2015 15:05:46 +0100 Subject: [PATCH] Fixed Visual Studio's warnings --- include/ArduinoJson/Internals/JsonBufferAllocated.hpp | 3 +++ test/DynamicJsonBuffer_Basic_Tests.cpp | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/ArduinoJson/Internals/JsonBufferAllocated.hpp b/include/ArduinoJson/Internals/JsonBufferAllocated.hpp index 3e283889..37eec8c0 100644 --- a/include/ArduinoJson/Internals/JsonBufferAllocated.hpp +++ b/include/ArduinoJson/Internals/JsonBufferAllocated.hpp @@ -16,6 +16,9 @@ class JsonBufferAllocated { void *operator new(size_t n, JsonBuffer *jsonBuffer) throw() { return jsonBuffer->alloc(n); } + + void operator delete(void*, JsonBuffer *) throw() { + } }; } } diff --git a/test/DynamicJsonBuffer_Basic_Tests.cpp b/test/DynamicJsonBuffer_Basic_Tests.cpp index e23a4001..13b97ad8 100644 --- a/test/DynamicJsonBuffer_Basic_Tests.cpp +++ b/test/DynamicJsonBuffer_Basic_Tests.cpp @@ -46,14 +46,14 @@ TEST_F(DynamicJsonBuffer_Basic_Tests, BlockCountChangesWhenFull) { TEST_F(DynamicJsonBuffer_Basic_Tests, CanAllocLessThanBlockCapacity) { void* p1 = buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY); - ASSERT_TRUE(p1); + ASSERT_FALSE(p1==NULL); void* p2 = buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY); - ASSERT_TRUE(p2); + ASSERT_FALSE(p2==NULL); } TEST_F(DynamicJsonBuffer_Basic_Tests, CantAllocMoreThanBlockCapacity) { void* p = buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY + 1); - ASSERT_FALSE(p); + ASSERT_TRUE(p==NULL); } TEST_F(DynamicJsonBuffer_Basic_Tests, ReturnDifferentPointer) {