Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed const correctness in casts and unused parameters.

Browse Source 
GCC was throwing warnings about const correctness issues and unused
parameters.  This patch gets rid of those warnings by using the
correct casts.
This commit is contained in:
Austin Schuh
2015-11-28 13:12:30 -08:00
parent f10f8558eb
commit bb9988365f
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/WireDecoder.cpp
View File

@@ -19,28 +19,28 @@ using namespace nt;
static double ReadDouble(const char*& buf) {
// Fast but non-portable!
std::uint64_t val = (*((unsigned char*)buf)) & 0xff;
std::uint64_t val = (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
++buf;
val <<= 8;
val |= (*((unsigned char*)buf)) & 0xff;
val |= (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
++buf;
val <<= 8;
val |= (*((unsigned char*)buf)) & 0xff;
val |= (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
++buf;
val <<= 8;
val |= (*((unsigned char*)buf)) & 0xff;
val |= (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
++buf;
val <<= 8;
val |= (*((unsigned char*)buf)) & 0xff;
val |= (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
++buf;
val <<= 8;
val |= (*((unsigned char*)buf)) & 0xff;
val |= (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
++buf;
val <<= 8;
val |= (*((unsigned char*)buf)) & 0xff;
val |= (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
++buf;
val <<= 8;
val |= (*((unsigned char*)buf)) & 0xff;
val |= (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
++buf;
return llvm::BitsToDouble(val);
}

14
src/WireDecoder.h
View File

@@ -74,7 +74,7 @@ class WireDecoder {
bool Read8(unsigned int* val) {
const char* buf;
if (!Read(&buf, 1)) return false;
*val = (*((unsigned char*)buf)) & 0xff;
*val = (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
return true;
}
@@ -82,10 +82,10 @@ class WireDecoder {
bool Read16(unsigned int* val) {
const char* buf;
if (!Read(&buf, 2)) return false;
unsigned int v = (*((unsigned char*)buf)) & 0xff;
unsigned int v = (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
++buf;
v <<= 8;
v |= (*((unsigned char*)buf)) & 0xff;
v |= (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
*val = v;
return true;
}
@@ -94,16 +94,16 @@ class WireDecoder {
bool Read32(unsigned long* val) {
const char* buf;
if (!Read(&buf, 4)) return false;
unsigned int v = (*((unsigned char*)buf)) & 0xff;
unsigned int v = (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
++buf;
v <<= 8;
v |= (*((unsigned char*)buf)) & 0xff;
v |= (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
++buf;
v <<= 8;
v |= (*((unsigned char*)buf)) & 0xff;
v |= (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
++buf;
v <<= 8;
v |= (*((unsigned char*)buf)) & 0xff;
v |= (*reinterpret_cast<const unsigned char*>(buf)) & 0xff;
*val = v;
return true;
}

2
src/leb128.cpp
View File

@@ -72,7 +72,7 @@ std::size_t ReadUleb128(const char* addr, unsigned long* ret) {
std::size_t count = 0;
while (1) {
unsigned char byte = *((unsigned char*)addr);
unsigned char byte = *reinterpret_cast<const unsigned char*>(addr);
addr++;
count++;

10
src/networktables/NetworkTable.cpp
View File

@@ -115,8 +115,8 @@ void NetworkTable::AddTableListenerEx(ITableListener* listener,
std::size_t prefix_len = path.size();
unsigned int id = nt::AddEntryListener(
path,
[=](unsigned int uid, StringRef name, std::shared_ptr<nt::Value> value,
unsigned int flags_) {
[=](unsigned int /*uid*/, StringRef name,
std::shared_ptr<nt::Value> value, unsigned int flags_) {
StringRef relative_key = name.substr(prefix_len);
if (relative_key.find(PATH_SEPARATOR_CHAR) != StringRef::npos) return;
listener->ValueChangedEx(this, relative_key, value, flags_);
@@ -141,7 +141,7 @@ void NetworkTable::AddTableListenerEx(StringRef key, ITableListener* listener,
path += key;
unsigned int id = nt::AddEntryListener(
path,
[=](unsigned int uid, StringRef name, std::shared_ptr<nt::Value> value,
[=](unsigned int /*uid*/, StringRef name, std::shared_ptr<nt::Value> value,
unsigned int flags_) {
if (name != path) return;
listener->ValueChangedEx(this, name.substr(prefix_len), value, flags_);
@@ -169,8 +169,8 @@ void NetworkTable::AddSubTableListener(ITableListener* listener,
if (localNotify) flags |= NT_NOTIFY_LOCAL;
unsigned int id = nt::AddEntryListener(
path,
[=](unsigned int uid, StringRef name, std::shared_ptr<nt::Value> value,
unsigned int flags_) mutable {
[=](unsigned int /*uid*/, StringRef name,
std::shared_ptr<nt::Value> /*value*/, unsigned int flags_) mutable {
StringRef relative_key = name.substr(prefix_len);
auto end_sub_table = relative_key.find(PATH_SEPARATOR_CHAR);
if (end_sub_table == StringRef::npos) return;