Skip to content

Commit

Permalink
Fixed signed/unsigned comparison warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
jrprice committed Aug 19, 2015
1 parent 034c00c commit 429bba5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,18 @@

// Default array size 50 * 2^20 (50*8 Mebibytes double precision)
// Use binary powers of two so divides 1024
int ARRAY_SIZE = 52428800;
unsigned int ARRAY_SIZE = 52428800;

int NTIMES = 10;
unsigned int NTIMES = 10;

bool useFloat = false;

int deviceIndex = 0;
unsigned int deviceIndex = 0;

int parseInt(const char *str, int *output)
int parseUInt(const char *str, unsigned int *output)
{
char *next;
*output = strtol(str, &next, 10);
*output = strtoul(str, &next, 10);
return !strlen(next);
}

Expand All @@ -64,23 +64,23 @@ void parseArguments(int argc, char *argv[])
}
else if (!strcmp(argv[i], "--device"))
{
if (++i >= argc || !parseInt(argv[i], &deviceIndex))
if (++i >= argc || !parseUInt(argv[i], &deviceIndex))
{
std::cout << "Invalid device index" << std::endl;
exit(1);
}
}
else if (!strcmp(argv[i], "--arraysize") || !strcmp(argv[i], "-s"))
{
if (++i >= argc || !parseInt(argv[i], &ARRAY_SIZE))
if (++i >= argc || !parseUInt(argv[i], &ARRAY_SIZE))
{
std::cout << "Invalid array size" << std::endl;
exit(1);
}
}
else if (!strcmp(argv[i], "--numtimes") || !strcmp(argv[i], "-n"))
{
if (++i >= argc || !parseInt(argv[i], &NTIMES))
if (++i >= argc || !parseUInt(argv[i], &NTIMES))
{
std::cout << "Invalid number of times" << std::endl;
exit(1);
Expand Down
6 changes: 3 additions & 3 deletions common.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ extern void parseArguments(int argc, char *argv[]);

extern void listDevices(void);

extern int ARRAY_SIZE;
extern int NTIMES;
extern unsigned int ARRAY_SIZE;
extern unsigned int NTIMES;

extern bool useFloat;

extern int deviceIndex;
extern unsigned int deviceIndex;


template < typename T >
Expand Down

0 comments on commit 429bba5

Please sign in to comment.