Skip to content

Fix register in cpp17 mode #109

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

Open
FrankXie05 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix register in cpp17 mode #109

Show file tree
Hide file tree
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 DevIL/src-IL/src/il_manip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ ILushort ILAPIENTRY ilFloatToHalf(ILuint i) {
// of float and half (127 versus 15).
//

register int s = (i >> 16) & 0x00008000;
register int e = ((i >> 23) & 0x000000ff) - (127 - 15);
register int m = i & 0x007fffff;
int s = (i >> 16) & 0x00008000;
int e = ((i >> 23) & 0x000000ff) - (127 - 15);
int m = i & 0x007fffff;

//
// Now reassemble s, e and m into a half:
Expand Down
2 changes: 1 addition & 1 deletion DevIL/src-ILU/src/ilu_scaling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ main(argc, argv)
int argc;
char *argv[];
{
register int c;
int c;
int optind;
char *optarg;
int xsize = 0, ysize = 0;
Expand Down