Skip to content

Commit a7bff4f

Browse files
committed
Fix File to mark overridden functions as 'override'
Enables a File object to be used via a pointer or reference to Stream and Print, and use the proper overridden functions.
1 parent 058d280 commit a7bff4f

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

teensy3/FS.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@ class File final : public Stream {
174174
size_t write(const void *buf, size_t size) {
175175
return (f) ? f->write(buf, size) : 0;
176176
}
177-
int available() {
177+
int available() override {
178178
return (f) ? f->available() : 0;
179179
}
180-
int peek() {
180+
int peek() override {
181181
return (f) ? f->peek() : -1;
182182
}
183-
void flush() {
183+
void flush() override {
184184
if (f) f->flush();
185185
}
186186
bool truncate(uint64_t size=0) {
@@ -231,13 +231,13 @@ class File final : public Stream {
231231
bool seek(uint64_t pos) {
232232
return seek(pos, SeekSet);
233233
}
234-
int read() {
234+
int read() override {
235235
if (!f) return -1;
236236
unsigned char b;
237237
if (f->read(&b, 1) < 1) return -1;
238238
return b;
239239
}
240-
size_t write(uint8_t b) {
240+
size_t write(uint8_t b) override {
241241
return (f) ? f->write(&b, 1) : 0;
242242
}
243243
size_t write(const char *str) {

teensy4/FS.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ class File final : public Stream {
176176
return (f) ? f->write(buf, size) : 0;
177177
}
178178
// Returns the number of bytes which may be read from a file
179-
int available() {
179+
int available() override {
180180
return (f) ? f->available() : 0;
181181
}
182-
int peek() {
182+
int peek() override {
183183
return (f) ? f->peek() : -1;
184184
}
185-
void flush() {
185+
void flush() override {
186186
if (f) f->flush();
187187
}
188188
bool truncate(uint64_t size=0) {
@@ -233,13 +233,13 @@ class File final : public Stream {
233233
bool seek(uint64_t pos) {
234234
return seek(pos, SeekSet);
235235
}
236-
int read() {
236+
int read() override {
237237
if (!f) return -1;
238238
unsigned char b;
239239
if (f->read(&b, 1) < 1) return -1;
240240
return b;
241241
}
242-
size_t write(uint8_t b) {
242+
size_t write(uint8_t b) override {
243243
return (f) ? f->write(&b, 1) : 0;
244244
}
245245
size_t write(const char *str) {

0 commit comments

Comments
 (0)