@@ -14,6 +14,7 @@ namespace Internals {
class JsonBufferAllocated {
public:
void *operator new(size_t n, JsonBuffer *jsonBuffer) throw() {
+ if (!jsonBuffer) return NULL;
return jsonBuffer->alloc(n);
}
@@ -79,9 +79,6 @@ class JsonVariantBase {
FORCE_INLINE const JsonObjectSubscript operator[](const char *key) const;
FORCE_INLINE const JsonObjectSubscript operator[](const String &key) const;
- protected:
- JsonVariantBase() {}
-
private:
const TImpl *impl() const { return static_cast<const TImpl *>(this); }
};
@@ -21,8 +21,6 @@ size_t List<T>::size() const {
template <typename T>
typename List<T>::node_type *List<T>::addNewNode() {
- if (!_buffer) return NULL;
node_type *newNode = new (_buffer) node_type();
if (_firstNode) {