Skip to content

Commit

Permalink
fixed minor compiler warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
magro11 committed May 17, 2024
1 parent af25e61 commit 0b9aa62
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
18 changes: 9 additions & 9 deletions common/param.h
Original file line number Diff line number Diff line change
Expand Up @@ -1069,19 +1069,19 @@ template <typename _Tp> struct ItomParamHelper

if (val)
{
int len = static_cast<int>(strlen((const char*)val));
int str_len = static_cast<int>(strlen((const char*)val));

if (((ito::int32)len != param->d->len) || (param->d->data.ptrVal == nullptr))
if (((ito::uint32)str_len != param->d->len) || (param->d->data.ptrVal == nullptr))
{
param->d->data.ptrVal = new char[len + 1];
param->d->data.ptrVal = new char[str_len + 1];
}
else
{
cVal_ = nullptr;
}

std::copy_n((const char*)val, len + 1, (char*)param->d->data.ptrVal);
param->d->len = len;
std::copy_n((const char*)val, str_len + 1, (char*)param->d->data.ptrVal);
param->d->len = str_len;
}
else
{
Expand All @@ -1101,7 +1101,7 @@ template <typename _Tp> struct ItomParamHelper

if ((val) && (len > 0))
{
if ((ito::int32)len != param->d->len)
if ((ito::uint32)len != param->d->len)
{
param->d->data.ptrVal = new char[len];
param->d->len = len;
Expand Down Expand Up @@ -1131,7 +1131,7 @@ template <typename _Tp> struct ItomParamHelper

if ((val) && (len > 0))
{
if ((ito::int32)len != param->d->len)
if ((ito::uint32)len != param->d->len)
{
param->d->data.ptrVal = new int32[len];
param->d->len = len;
Expand Down Expand Up @@ -1161,7 +1161,7 @@ template <typename _Tp> struct ItomParamHelper

if ((val) && (len > 0))
{
if ((ito::int32)len != param->d->len)
if ((ito::uint32)len != param->d->len)
{
param->d->data.ptrVal = new float64[len];
param->d->len = len;
Expand Down Expand Up @@ -1191,7 +1191,7 @@ template <typename _Tp> struct ItomParamHelper

if ((val) && (len > 0))
{
if ((ito::int32)len != param->d->len)
if ((ito::uint32)len != param->d->len)
{
param->d->data.ptrVal = new complex128[len];
param->d->len = len;
Expand Down
1 change: 0 additions & 1 deletion itom_unittests/unittest_addinmanager/AddInManagerTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ TEST(AddInManagerTest, General)
}

char* oldpath = getenv("path");
char pathSep[] = ";";

// try add or lib directory to path variables, to avoid user has to do this
QString libDir = addInPath + QString("/lib");
Expand Down

0 comments on commit 0b9aa62

Please sign in to comment.