Skip to content

Commit 7526628

Browse files
Fix some warnings
1 parent 70988aa commit 7526628

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/canWrapper.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ Napi::Object receiveMessage(const Napi::CallbackInfo& info) {
239239
size_t messageSize = message->GetSize();
240240
const uint8_t* messageData = message->GetData();
241241
Napi::Array napiMessage = Napi::Array::New(env, messageSize);
242-
for (int i = 0; i < messageSize; i++) {
242+
for (size_t i = 0; i < messageSize; i++) {
243243
napiMessage[i] = messageData[i];
244244
}
245245
Napi::Object messageInfo = Napi::Object::New(env);
@@ -332,7 +332,7 @@ Napi::Number openStreamSession(const Napi::CallbackInfo& info) {
332332
try {
333333
rev::usb::CANStatus status = device->OpenStreamSession(&sessionHandle, filter, maxSize);
334334
if (status != rev::usb::CANStatus::kOk) {
335-
Napi::Error::New(env, "Opening stream session failed with error code "+(int)status).ThrowAsJavaScriptException();
335+
Napi::Error::New(env, "Opening stream session failed with error code "+std::to_string((int)status)).ThrowAsJavaScriptException();
336336
} else {
337337
return Napi::Number::New(env, sessionHandle);
338338
}
@@ -661,7 +661,7 @@ void heartbeatsWatchdog() {
661661
{
662662
// Erase removed CAN buses from heartbeatsRunning
663663
std::scoped_lock lock{watchdogMtx, canDevicesMtx};
664-
for(int i = 0; i < heartbeatsRunning.size(); i++) {
664+
for(size_t i = 0; i < heartbeatsRunning.size(); i++) {
665665
auto deviceIterator = canDeviceMap.find(heartbeatsRunning[i]);
666666
if (deviceIterator == canDeviceMap.end()) {
667667
heartbeatsRunning.erase(heartbeatsRunning.begin() + i);
@@ -678,7 +678,7 @@ void heartbeatsWatchdog() {
678678
if (elapsed_seconds.count() > 1) {
679679
uint8_t sparkMaxHeartbeat[] = {0, 0, 0, 0, 0, 0, 0, 0};
680680
uint8_t revCommonHeartbeat[] = {0};
681-
for(int i = 0; i < heartbeatsRunning.size(); i++) {
681+
for(size_t i = 0; i < heartbeatsRunning.size(); i++) {
682682
_sendCANMessage(heartbeatsRunning[i], 0x2052C80, sparkMaxHeartbeat, 8, -1);
683683
_sendCANMessage(heartbeatsRunning[i], 0x00502C0, revCommonHeartbeat, 1, -1);
684684
}
@@ -714,7 +714,7 @@ void startRevCommonHeartbeat(const Napi::CallbackInfo& info) {
714714
std::thread hb(heartbeatsWatchdog);
715715
hb.detach();
716716
} else {
717-
for(int i = 0; i < heartbeatsRunning.size(); i++) {
717+
for(size_t i = 0; i < heartbeatsRunning.size(); i++) {
718718
if (heartbeatsRunning[i].compare(descriptor) == 0) return;
719719
}
720720
heartbeatsRunning.push_back(descriptor);
@@ -760,7 +760,7 @@ void setSparkMaxHeartbeatData(const Napi::CallbackInfo& info) {
760760
std::thread hb(heartbeatsWatchdog);
761761
hb.detach();
762762
} else {
763-
for(int i = 0; i < heartbeatsRunning.size(); i++) {
763+
for(size_t i = 0; i < heartbeatsRunning.size(); i++) {
764764
if (heartbeatsRunning[i].compare(descriptor) == 0) return;
765765
}
766766
heartbeatsRunning.push_back(descriptor);

0 commit comments

Comments
 (0)