Skip to content

Commit 962db1a

Browse files
authored
Fix -Wsign-compare warnings in 1DS C++ SDK. (#1321)
1 parent 0a4edad commit 962db1a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

lib/jni/LogManager_jni.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ Java_com_microsoft_applications_events_LogManagerProvider_00024LogManagerImpl_na
892892
ManagerAndConfig const* mc;
893893
{
894894
std::lock_guard<std::mutex> lock(jniManagersMutex);
895-
if (nativeLogManagerIndex < 0 || nativeLogManagerIndex >= jniManagers.size())
895+
if (nativeLogManagerIndex < 0 || nativeLogManagerIndex >= static_cast<jlong>(jniManagers.size()))
896896
{
897897
return nullptr;
898898
}
@@ -914,7 +914,7 @@ Java_com_microsoft_applications_events_LogManagerProvider_00024LogManagerImpl_na
914914
{
915915
{
916916
std::lock_guard<std::mutex> lock(jniManagersMutex);
917-
if (nativeLogManager < 0 || nativeLogManager >= jniManagers.size())
917+
if (nativeLogManager < 0 || nativeLogManager >= static_cast<jlong>(jniManagers.size()))
918918
{
919919
return;
920920
}
@@ -971,7 +971,7 @@ Java_com_microsoft_applications_events_LogManagerProvider_00024LogManagerImpl_na
971971
ManagerAndConfig* mc;
972972
{
973973
std::lock_guard<std::mutex> lock(jniManagersMutex);
974-
if (nativeLogManagerIndex < 0 || nativeLogManagerIndex >= jniManagers.size())
974+
if (nativeLogManagerIndex < 0 || nativeLogManagerIndex >= static_cast<jlong>(jniManagers.size()))
975975
{
976976
return 0;
977977
}
@@ -997,7 +997,7 @@ Java_com_microsoft_applications_events_LogManagerProvider_00024LogManagerImpl_na
997997
static ILogManager* getLogManager(jlong nativeLogManager)
998998
{
999999
std::lock_guard<std::mutex> lock(jniManagersMutex);
1000-
if (nativeLogManager < 0 || nativeLogManager >= jniManagers.size())
1000+
if (nativeLogManager < 0 || nativeLogManager >= static_cast<jlong>(jniManagers.size()))
10011001
{
10021002
return nullptr;
10031003
}
@@ -1587,7 +1587,8 @@ Java_com_microsoft_applications_events_LogManagerProvider_00024LogManagerImpl_na
15871587
jlong eventType,
15881588
jlong identity) {
15891589
std::lock_guard<std::mutex> l(listeners_mutex);
1590-
if (identity < 0 || identity >= listeners.size() || !listeners[identity]) {
1590+
if (identity < 0 || identity >= static_cast<jlong>(jniManagers.size()) || !listeners[identity])
1591+
{
15911592
return;
15921593
}
15931594
auto logManager = getLogManager(native_log_manager);

tests/common/SocketTools.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class SocketAddr
128128
#ifdef _WIN32
129129
INT addrlen = sizeof(m_data);
130130
WCHAR buf[200];
131-
for(int i = 0; i < sizeof(buf) && addr[i]; i++)
131+
for(size_t i = 0; i < sizeof(buf) && addr[i]; i++)
132132
{
133133
buf[i] = addr[i];
134134
}

0 commit comments

Comments
 (0)