Skip to content

Commit

Permalink
Fix warning on VS2013
Browse files Browse the repository at this point in the history
  • Loading branch information
bblanchon committed Dec 23, 2016
1 parent 8a03a58 commit ebc9e14
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions include/ArduinoJson/Deserialization/StringWriter.hpp
Expand Up @@ -14,26 +14,26 @@ class StringWriter {
public:
class String {
public:
String(char*& ptr) : _writePtr(ptr), _startPtr(ptr) {}
String(char** ptr) : _writePtr(ptr), _startPtr(*ptr) {}

void append(char c) {
*_writePtr++ = c;
*(*_writePtr)++ = c;
}

const char* c_str() const {
*_writePtr++ = 0;
*(*_writePtr)++ = 0;
return _startPtr;
}

private:
char*& _writePtr;
char* const _startPtr;
char** _writePtr;
char* _startPtr;
};

StringWriter(char* buffer) : _ptr(buffer) {}

String startString() {
return String(_ptr);
return String(&_ptr);
}

private:
Expand Down
16 changes: 8 additions & 8 deletions include/ArduinoJson/StaticJsonBuffer.hpp
Expand Up @@ -25,23 +25,23 @@ class StaticJsonBufferBase : public JsonBuffer {
public:
class String {
public:
String(StaticJsonBufferBase& parent) : _parent(parent) {
_start = parent._buffer + parent._size;
String(StaticJsonBufferBase* parent) : _parent(parent) {
_start = parent->_buffer + parent->_size;
}

void append(char c) {
if (_parent._size >= _parent._capacity) return;
_parent._buffer[_parent._size++] = c;
if (_parent->_size >= _parent->_capacity) return;
_parent->_buffer[_parent->_size++] = c;
}

const char* c_str() const {
if (_parent._size >= _parent._capacity) return NULL;
_parent._buffer[_parent._size++] = 0;
if (_parent->_size >= _parent->_capacity) return NULL;
_parent->_buffer[_parent->_size++] = 0;
return _start;
}

private:
StaticJsonBufferBase& _parent;
StaticJsonBufferBase* _parent;
char* _start;
};

Expand All @@ -63,7 +63,7 @@ class StaticJsonBufferBase : public JsonBuffer {
}

String startString() {
return String(*this);
return String(this);
}

private:
Expand Down

0 comments on commit ebc9e14

Please sign in to comment.