Skip to content

Commit e4765f9

Browse files
author
mikee47
committed
Make improvements suggested by clang-tidy
1 parent d7a129d commit e4765f9

File tree

5 files changed

+31
-4
lines changed

5 files changed

+31
-4
lines changed

src/include/FlashString/Object.hpp

+10-1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,14 @@ template <class ObjectType, typename ElementType> class Object : public ObjectBa
144144
{
145145
}
146146

147+
~Object()
148+
{
149+
}
150+
151+
Object(const Object&& obj) = delete;
152+
Object& operator=(const Object& other) = delete;
153+
Object& operator=(const Object&& other) = delete;
154+
147155
Iterator begin() const
148156
{
149157
return Iterator(as<ObjectType>(), 0);
@@ -177,7 +185,7 @@ template <class ObjectType, typename ElementType> class Object : public ObjectBa
177185
auto len = self.length();
178186
for(unsigned i = 0; i < len; ++i) {
179187
if(self.unsafeValueAt(dataptr, i) == value) {
180-
return i;
188+
return int(i);
181189
}
182190
}
183191

@@ -204,6 +212,7 @@ template <class ObjectType, typename ElementType> class Object : public ObjectBa
204212

205213
FSTR_INLINE DataPtrType data() const
206214
{
215+
// NOLINTNEXTLINE
207216
return reinterpret_cast<DataPtrType>(ObjectBase::data());
208217
}
209218

src/include/FlashString/ObjectBase.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class ObjectBase
4141
return 0;
4242
}
4343
if(isCopy()) {
44+
// NOLINTNEXTLINE
4445
return reinterpret_cast<const ObjectBase*>(flashLength_ & ~copyBit)->length();
4546
}
4647
return flashLength_;

src/include/FlashString/ObjectIterator.hpp

+10-3
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,19 @@ template <class ObjectType, typename ElementType> class ObjectIterator
3636

3737
ObjectIterator() = default;
3838
ObjectIterator(const ObjectIterator&) = default;
39+
ObjectIterator(ObjectIterator&&) = default;
40+
ObjectIterator& operator=(const ObjectIterator&) = default;
41+
ObjectIterator& operator=(ObjectIterator&&) = default;
3942

4043
ObjectIterator(const ObjectType& object, unsigned index)
4144
: data(pointer(object.data())), length(object.length()), index(index)
4245
{
4346
}
4447

48+
~ObjectIterator()
49+
{
50+
}
51+
4552
ObjectIterator& operator++()
4653
{
4754
++index;
@@ -93,9 +100,9 @@ template <class ObjectType, typename ElementType> class ObjectIterator
93100
}
94101

95102
private:
96-
const pointer data;
97-
size_t length;
98-
unsigned index = 0;
103+
pointer data{};
104+
size_t length{0};
105+
unsigned index{0};
99106
};
100107

101108
} // namespace FSTR

src/include/FlashString/String.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ class String : public Object<String, char>
187187
*/
188188
flash_string_t data() const
189189
{
190+
// NOLINTNEXTLINE
190191
return reinterpret_cast<flash_string_t>(Object::data());
191192
}
192193

src/include/FlashString/StringPrinter.hpp

+9
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ class StringPrinter
3838
{
3939
}
4040

41+
StringPrinter(const StringPrinter&) = delete;
42+
StringPrinter(StringPrinter&&) = delete;
43+
StringPrinter& operator=(const StringPrinter&) = delete;
44+
StringPrinter& operator=(StringPrinter&&) = delete;
45+
46+
~StringPrinter()
47+
{
48+
}
49+
4150
size_t printTo(Print& p) const;
4251

4352
private:

0 commit comments

Comments
 (0)