Skip to content

Commit

Permalink
Merge pull request #409 from kratz00/gcc_10_warning_fixes
Browse files Browse the repository at this point in the history
gcc 10 warning fixes
  • Loading branch information
john30 authored May 6, 2021
2 parents c8a4ad5 + b6be30f commit 88e6eec
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 3 additions & 5 deletions src/lib/ebus/datatype.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ bool DataType::dump(OutputFormat outputFormat, size_t length, bool appendDivisor
}


result_t StringDataType::readRawValue(size_t offset, size_t length, const SymbolString& input,
unsigned int* value) const {
result_t StringDataType::readRawValue(size_t, size_t, const SymbolString&, unsigned int*) const {
return RESULT_EMPTY;
}

Expand Down Expand Up @@ -204,8 +203,7 @@ result_t StringDataType::writeSymbols(size_t offset, size_t length, istringstrea
}


result_t DateTimeDataType::readRawValue(size_t offset, size_t length, const SymbolString& input,
unsigned int* value) const {
result_t DateTimeDataType::readRawValue(size_t, size_t, const SymbolString&, unsigned int*) const {
return RESULT_EMPTY;
}

Expand Down Expand Up @@ -353,7 +351,7 @@ result_t DateTimeDataType::readSymbols(size_t offset, size_t length, const Symbo
}
*output << dec << setfill('0') << setw(2) << static_cast<unsigned>(d) << "."
<< setw(2) << static_cast<unsigned>(m) << "." << static_cast<unsigned>(y + 1900);
m = (int)(minutes%(24*60));
m = static_cast<int>(minutes%(24*60));
d = m/60;
*output << " " << setw(2) << dec << setfill('0') << static_cast<unsigned>(d);
m -= d*60;
Expand Down
2 changes: 1 addition & 1 deletion src/tools/ebuspicloader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,7 @@ int main(int argc, char* argv[]) {
printFileChecksum();
exit(EXIT_SUCCESS);
} else {
argp_help(&aargp, stderr, ARGP_HELP_STD_ERR, "ebuspicloader");
argp_help(&aargp, stderr, ARGP_HELP_STD_ERR, const_cast<char*>("ebuspicloader"));
exit(EXIT_FAILURE);
}
}
Expand Down

0 comments on commit 88e6eec

Please sign in to comment.