Fix compilation with clang

bblanchon · Apr 18, 2015 · 206a0d1 · 206a0d1
1 parent 1ce45e5
commit 206a0d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/include/ArduinoJson/DynamicJsonBuffer.hpp b/include/ArduinoJson/DynamicJsonBuffer.hpp
@@ -14,7 +14,7 @@ namespace ArduinoJson {
 
 // Forward declaration
 namespace Internals {
-class DynamicJsonBufferBlock;
+struct DynamicJsonBufferBlock;
 }
 
 // Implements a JsonBuffer with dynamic memory allocation.

diff --git a/src/DynamicJsonBuffer.cpp b/src/DynamicJsonBuffer.cpp
@@ -6,19 +6,24 @@
 
 #include "../include/ArduinoJson/DynamicJsonBuffer.hpp"
 
-using namespace ArduinoJson;
-
 namespace ArduinoJson {
 namespace Internals {
-struct DynamicJsonBufferBlock {
+struct DynamicJsonBufferBlockWithoutData {
   DynamicJsonBufferBlock* next;
   size_t capacity;
   size_t size;
+};
+
+
+struct DynamicJsonBufferBlock : DynamicJsonBufferBlockWithoutData {
   uint8_t data[1];
 };
 }
 }
 
+using namespace ArduinoJson;
+using namespace ArduinoJson::Internals;
+
 DynamicJsonBuffer::DynamicJsonBuffer() {
   _head = createBlock(FIRST_BLOCK_CAPACITY);
 }
@@ -65,7 +70,7 @@ void DynamicJsonBuffer::addNewBlock() {
 }
 
 DynamicJsonBuffer::Block* DynamicJsonBuffer::createBlock(size_t capacity) {
-  size_t blkSize = sizeof(Block) - sizeof(Block::data) + capacity;
+  size_t blkSize = sizeof(DynamicJsonBufferBlockWithoutData) + capacity;
   Block* block = static_cast<Block*>(malloc(blkSize));
   block->capacity = capacity;
   block->size = 0;