Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'conversion-warnings' into 'master'

Browse Source 
Fix a couple of conversion warnings in OptionParser for testing.

See merge request !31
This commit is contained in:
Kenneth Moreland 2015-06-11 10:28:30 -04:00
commit 8764a17c2d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/testing/OptionParser.h
View File

@ -540,7 +540,7 @@ public:
*/ */
int index() const int index() const
{ {
return desc == 0 ? -1 : desc->index; return desc == 0 ? -1 : static_cast<int>(desc->index);
} }
/** /**
@ -1454,7 +1454,7 @@ public:
{ return false; } // overflow protection: don't accept number of options that doesn't fit signed int { return false; } // overflow protection: don't accept number of options that doesn't fit signed int
buffer[parser.op_count] = option; buffer[parser.op_count] = option;
int idx = buffer[parser.op_count].desc->index; unsigned int idx = buffer[parser.op_count].desc->index;
if (options[idx]) if (options[idx])
{ options[idx].append(buffer[parser.op_count]); } { options[idx].append(buffer[parser.op_count]); }
else else