github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 00:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Visual Studio's warnings

Browse Source
This commit is contained in:
Benoit Blanchon
2015-02-07 15:05:46 +01:00
parent 02960f28e4
commit 80913b8044
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/ArduinoJson/Internals/JsonBufferAllocated.hpp
View File

@@ -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() {
}
};
}
}

6
test/DynamicJsonBuffer_Basic_Tests.cpp
View File

@@ -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) {