diff options
| author | magumagu <magumagu9@gmail.com> | 2015-03-16 11:50:42 -0700 |
|---|---|---|
| committer | magumagu <magumagu9@gmail.com> | 2015-03-16 11:50:42 -0700 |
| commit | adb8bbed900bccf7e7fbfa5e79d3262bede18e21 (patch) | |
| tree | e32c61e43c53fdb73c00b18de3be109b2f0bd722 /Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp | |
| parent | 0b6562b53f2d315bfc88d943658c05f75cd8fc2a (diff) | |
| parent | ad64336137013a823c212e4e491dbb435aa11e5f (diff) | |
Merge pull request #2217 from shuffle2/quiet-warnings
quiet some warnings which appear on vs2015.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp index 296cbfc3cb..393cb0d404 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp @@ -1912,7 +1912,7 @@ namespace GLExtensions *func = dlsym(RTLD_NEXT, name.c_str()); #endif if (*func == nullptr && _isES) - *func = (void*)0xFFFFFFFF; // Easy to determine invalid function, just so we continue on + *func = (void*)(uintptr_t)0xFFFFFFFF; // Easy to determine invalid function, just so we continue on if (*func == nullptr) ERROR_LOG(VIDEO, "Couldn't load function %s", name.c_str()); } |