Skip to content

Commit 3b48781

Browse files
matth-xmatth-x
committed
fix compiler warnings
1 parent 5abe75e commit 3b48781

30 files changed

Lines changed: 116 additions & 118 deletions

‎src/MicroOcpp/Core/ConfigurationKeyValue.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,6 @@ std::function<bool(const char*)> Configuration<const char *>::getValidator() {
254254
template class Configuration<int>;
255255
template class Configuration<float>;
256256
template class Configuration<bool>;
257-
template class Configuration<const char *>;
257+
//template class Configuration<const char *>; //no effect after explicit specialization
258258

259259
} //end namespace MicroOcpp

‎src/MicroOcpp/Core/FilesystemAdapter.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class ArduinoFilesystemAdapter : public FilesystemAdapter {
141141
bool remove(const char *fn) override {
142142
return USE_FS.remove(fn);
143143
};
144-
int ftw_root(std::function<int(const char *fpath)> fn) {
144+
int ftw_root(std::function<int(const char *fpath)> fn) override {
145145
#if MOCPP_USE_FILEAPI == ARDUINO_LITTLEFS
146146
auto dir = USE_FS.open(MOCPP_FILENAME_PREFIX);
147147
if (!dir) {
@@ -244,7 +244,7 @@ class EspIdfFileAdapter : public FileAdapter {
244244
return fseek(file, offset, SEEK_SET);
245245
}
246246

247-
int read() {
247+
int read() override {
248248
return fgetc(file);
249249
}
250250
};
@@ -285,7 +285,7 @@ class EspIdfFilesystemAdapter : public FilesystemAdapter {
285285
return unlink(fn) == 0;
286286
}
287287

288-
int ftw_root(std::function<int(const char *fpath)> fn) {
288+
int ftw_root(std::function<int(const char *fpath)> fn) override {
289289
//open MO root directory
290290
char dname [MOCPP_MAX_PATH_SIZE];
291291
auto dlen = snprintf(dname, MOCPP_MAX_PATH_SIZE, "%s", MOCPP_FILENAME_PREFIX);
@@ -399,7 +399,7 @@ class PosixFileAdapter : public FileAdapter {
399399
return fseek(file, offset, SEEK_SET);
400400
}
401401

402-
int read() {
402+
int read() override {
403403
return fgetc(file);
404404
}
405405
};
@@ -435,7 +435,7 @@ class PosixFilesystemAdapter : public FilesystemAdapter {
435435
return ::remove(fn) == 0;
436436
}
437437

438-
int ftw_root(std::function<int(const char *fpath)> fn) {
438+
int ftw_root(std::function<int(const char *fpath)> fn) override {
439439
auto dir = opendir(MOCPP_FILENAME_PREFIX); // use c_str() to convert the path string to a C-style string
440440
if (!dir) {
441441
MOCPP_DBG_ERR("cannot open root directory: " MOCPP_FILENAME_PREFIX);

‎src/MicroOcpp/Core/OcppError.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace MicroOcpp {
1313

1414
class NotImplemented : public Operation {
1515
public:
16-
const char *getErrorCode() {
16+
const char *getErrorCode() override {
1717
return "NotImplemented";
1818
}
1919
};
@@ -24,13 +24,13 @@ class MsgBufferExceeded : public Operation {
2424
size_t msgLen;
2525
public:
2626
MsgBufferExceeded(size_t maxCapacity, size_t msgLen) : maxCapacity(maxCapacity), msgLen(msgLen) { }
27-
const char *getErrorCode() {
27+
const char *getErrorCode() override {
2828
return "GenericError";
2929
}
30-
const char *getErrorDescription() {
30+
const char *getErrorDescription() override {
3131
return "JSON too long or too many fields. Cannot deserialize";
3232
}
33-
std::unique_ptr<DynamicJsonDocument> getErrorDetails() {
33+
std::unique_ptr<DynamicJsonDocument> getErrorDetails() override {
3434
auto errDoc = std::unique_ptr<DynamicJsonDocument>(new DynamicJsonDocument(JSON_OBJECT_SIZE(2)));
3535
JsonObject err = errDoc->to<JsonObject>();
3636
err["max_capacity"] = maxCapacity;

‎src/MicroOcpp/Operations/Authorize.h‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,17 @@ class Authorize : public Operation {
1919
Model& model;
2020
char idTag [IDTAG_LEN_MAX + 1] = {'\0'};
2121
public:
22-
// Authorize();
23-
2422
Authorize(Model& model, const char *idTag);
2523

26-
const char* getOperationType();
24+
const char* getOperationType() override;
2725

28-
std::unique_ptr<DynamicJsonDocument> createReq();
26+
std::unique_ptr<DynamicJsonDocument> createReq() override;
2927

30-
void processConf(JsonObject payload);
28+
void processConf(JsonObject payload) override;
3129

32-
void processReq(JsonObject payload);
30+
void processReq(JsonObject payload) override;
3331

34-
std::unique_ptr<DynamicJsonDocument> createConf();
32+
std::unique_ptr<DynamicJsonDocument> createConf() override;
3533

3634
};
3735

‎src/MicroOcpp/Operations/BootNotification.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ class BootNotification : public Operation {
2929

3030
~BootNotification() = default;
3131

32-
const char* getOperationType();
32+
const char* getOperationType() override;
3333

34-
std::unique_ptr<DynamicJsonDocument> createReq();
34+
std::unique_ptr<DynamicJsonDocument> createReq() override;
3535

36-
void processConf(JsonObject payload);
36+
void processConf(JsonObject payload) override;
3737

38-
void processReq(JsonObject payload);
38+
void processReq(JsonObject payload) override;
3939

40-
std::unique_ptr<DynamicJsonDocument> createConf();
40+
std::unique_ptr<DynamicJsonDocument> createConf() override;
4141

42-
const char *getErrorCode() {return errorCode;}
42+
const char *getErrorCode() override {return errorCode;}
4343
};
4444

4545
} //end namespace Ocpp16

‎src/MicroOcpp/Operations/CancelReservation.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ class CancelReservation : public Operation {
2121
public:
2222
CancelReservation(Model& model);
2323

24-
const char* getOperationType();
24+
const char* getOperationType() override;
2525

26-
void processReq(JsonObject payload);
26+
void processReq(JsonObject payload) override;
2727

28-
std::unique_ptr<DynamicJsonDocument> createConf();
28+
std::unique_ptr<DynamicJsonDocument> createConf() override;
2929

30-
const char *getErrorCode() {return errorCode;}
30+
const char *getErrorCode() override {return errorCode;}
3131
};
3232

3333
} //end namespace Ocpp16

‎src/MicroOcpp/Operations/ChangeAvailability.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ class ChangeAvailability : public Operation {
2323
public:
2424
ChangeAvailability(Model& model);
2525

26-
const char* getOperationType();
26+
const char* getOperationType() override;
2727

28-
void processReq(JsonObject payload);
28+
void processReq(JsonObject payload) override;
2929

30-
std::unique_ptr<DynamicJsonDocument> createConf();
30+
std::unique_ptr<DynamicJsonDocument> createConf() override;
3131

32-
const char *getErrorCode() {return errorCode;}
32+
const char *getErrorCode() override {return errorCode;}
3333
};
3434

3535
} //end namespace Ocpp16

‎src/MicroOcpp/Operations/ChangeConfiguration.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ class ChangeConfiguration : public Operation {
2121
public:
2222
ChangeConfiguration();
2323

24-
const char* getOperationType();
24+
const char* getOperationType() override;
2525

26-
void processReq(JsonObject payload);
26+
void processReq(JsonObject payload) override;
2727

28-
std::unique_ptr<DynamicJsonDocument> createConf();
28+
std::unique_ptr<DynamicJsonDocument> createConf() override;
2929

30-
const char *getErrorCode() {return errorCode;}
30+
const char *getErrorCode() override {return errorCode;}
3131

3232
};
3333

‎src/MicroOcpp/Operations/ClearCache.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ class ClearCache : public Operation {
1818
public:
1919
ClearCache(std::shared_ptr<FilesystemAdapter> filesystem);
2020

21-
const char* getOperationType();
21+
const char* getOperationType() override;
2222

23-
void processReq(JsonObject payload);
23+
void processReq(JsonObject payload) override;
2424

25-
std::unique_ptr<DynamicJsonDocument> createConf();
25+
std::unique_ptr<DynamicJsonDocument> createConf() override;
2626
};
2727

2828
} //end namespace Ocpp16

‎src/MicroOcpp/Operations/ClearChargingProfile.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ class ClearChargingProfile : public Operation {
2020
public:
2121
ClearChargingProfile(SmartChargingService& scService);
2222

23-
const char* getOperationType();
23+
const char* getOperationType() override;
2424

25-
void processReq(JsonObject payload);
25+
void processReq(JsonObject payload) override;
2626

27-
std::unique_ptr<DynamicJsonDocument> createConf();
27+
std::unique_ptr<DynamicJsonDocument> createConf() override;
2828

2929
};
3030

0 commit comments

Comments
 (0)