Skip to content

Revert "Removed long to int warnings and unused variables" #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rijnb merged 1 commit into from
Jul 27, 2015
Merged

Revert "Removed long to int warnings and unused variables" #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions utility/mapcode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#undef LIMIT_TO_MICRODEGREES

#define my_isnan(x) (false)
#define my_round(x) ((int) (floor((x) + 0.5)))
#define my_round(x) ((long) (floor((x) + 0.5)))

static int selfCheckEnabled = 0;

Expand Down Expand Up @@ -456,7 +456,7 @@ int main(const int argc, const char** argv)
const char* suffix = strstr(mapcode, "-");
extraDigits = 0;
if (suffix != 0) {
extraDigits = (int) (strlen(suffix) - 1);
extraDigits = strlen(suffix) - 1;
}
selfCheckLatLonToMapcode(lat, lon, defaultTerritory, mapcode, extraDigits);
}
Expand Down Expand Up @@ -651,7 +651,7 @@ int main(const int argc, const char** argv)
srand(seed);
}
else {
srand((unsigned int) time(0));
srand(time(0));
}
}
useXYZ = (strstr(cmd, "XYZ") != 0);
Expand Down