Clang-format: set DerivePointerAlignment to false

This commit is contained in:
Benoit Blanchon
2022-08-09 16:52:17 +02:00
parent 62e83133cd
commit 8002722f3b
53 changed files with 514 additions and 513 deletions

View File

@@ -8,7 +8,7 @@
namespace ARDUINOJSON_NAMESPACE {
inline VariantData *arrayAdd(CollectionData *arr, MemoryPool *pool) {
inline VariantData* arrayAdd(CollectionData* arr, MemoryPool* pool) {
return arr ? arr->addElement(pool) : 0;
}

View File

@@ -11,13 +11,13 @@ namespace ARDUINOJSON_NAMESPACE {
class VariantPtr {
public:
VariantPtr(MemoryPool *pool, VariantData *data) : _variant(pool, data) {}
VariantPtr(MemoryPool* pool, VariantData* data) : _variant(pool, data) {}
VariantRef *operator->() {
VariantRef* operator->() {
return &_variant;
}
VariantRef &operator*() {
VariantRef& operator*() {
return _variant;
}
@@ -28,7 +28,7 @@ class VariantPtr {
class ArrayIterator {
public:
ArrayIterator() : _slot(0) {}
explicit ArrayIterator(MemoryPool *pool, VariantSlot *slot)
explicit ArrayIterator(MemoryPool* pool, VariantSlot* slot)
: _pool(pool), _slot(slot) {}
VariantRef operator*() const {
@@ -38,42 +38,42 @@ class ArrayIterator {
return VariantPtr(_pool, _slot->data());
}
bool operator==(const ArrayIterator &other) const {
bool operator==(const ArrayIterator& other) const {
return _slot == other._slot;
}
bool operator!=(const ArrayIterator &other) const {
bool operator!=(const ArrayIterator& other) const {
return _slot != other._slot;
}
ArrayIterator &operator++() {
ArrayIterator& operator++() {
_slot = _slot->next();
return *this;
}
ArrayIterator &operator+=(size_t distance) {
ArrayIterator& operator+=(size_t distance) {
_slot = _slot->next(distance);
return *this;
}
VariantSlot *internal() {
VariantSlot* internal() {
return _slot;
}
private:
MemoryPool *_pool;
VariantSlot *_slot;
MemoryPool* _pool;
VariantSlot* _slot;
};
class VariantConstPtr {
public:
VariantConstPtr(const VariantData *data) : _variant(data) {}
VariantConstPtr(const VariantData* data) : _variant(data) {}
VariantConstRef *operator->() {
VariantConstRef* operator->() {
return &_variant;
}
VariantConstRef &operator*() {
VariantConstRef& operator*() {
return _variant;
}
@@ -84,7 +84,7 @@ class VariantConstPtr {
class ArrayConstRefIterator {
public:
ArrayConstRefIterator() : _slot(0) {}
explicit ArrayConstRefIterator(const VariantSlot *slot) : _slot(slot) {}
explicit ArrayConstRefIterator(const VariantSlot* slot) : _slot(slot) {}
VariantConstRef operator*() const {
return VariantConstRef(_slot->data());
@@ -93,29 +93,29 @@ class ArrayConstRefIterator {
return VariantConstPtr(_slot->data());
}
bool operator==(const ArrayConstRefIterator &other) const {
bool operator==(const ArrayConstRefIterator& other) const {
return _slot == other._slot;
}
bool operator!=(const ArrayConstRefIterator &other) const {
bool operator!=(const ArrayConstRefIterator& other) const {
return _slot != other._slot;
}
ArrayConstRefIterator &operator++() {
ArrayConstRefIterator& operator++() {
_slot = _slot->next();
return *this;
}
ArrayConstRefIterator &operator+=(size_t distance) {
ArrayConstRefIterator& operator+=(size_t distance) {
_slot = _slot->next(distance);
return *this;
}
const VariantSlot *internal() {
const VariantSlot* internal() {
return _slot;
}
private:
const VariantSlot *_slot;
const VariantSlot* _slot;
};
} // namespace ARDUINOJSON_NAMESPACE

View File

@@ -30,20 +30,20 @@ class ArrayShortcuts {
// TValue = bool, long, int, short, float, double, serialized, VariantRef,
// std::string, String, ObjectRef
template <typename T>
FORCE_INLINE bool add(const T &value) const {
FORCE_INLINE bool add(const T& value) const {
return impl()->add().set(value);
}
//
// bool add(TValue);
// TValue = char*, const char*, const __FlashStringHelper*
template <typename T>
FORCE_INLINE bool add(T *value) const {
FORCE_INLINE bool add(T* value) const {
return impl()->add().set(value);
}
private:
const TArray *impl() const {
return static_cast<const TArray *>(this);
const TArray* impl() const {
return static_cast<const TArray*>(this);
}
};
} // namespace ARDUINOJSON_NAMESPACE