Remove the min/max functions in CommonFuncs. #334
Merged
+104
−99
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -158,15 +158,11 @@ extern "C" { | |||
| #endif // M_IX86 | |||
| #endif // WIN32 ndef | |||
|
|
|||
| // Dolphin's min and max functions | |||
| // Undefine any min or max macros that might get defined | |||
| // (whether it be though Windows headers, or other libraries) | |||
| #undef min | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
How about and then always explicitly use |
|
Can you please make these changes so this can be merged @lioncash ... |
|
I was planning to do so after work.
|
The algorithm header has the same functions.
shuffle2
added a commit
that referenced
this pull request
May 30, 2014
Remove the min/max functions in CommonFuncs.
phire
added a commit
to phire/dolphin
that referenced
this pull request
Jul 14, 2014
Another issue from dolphin-emu#334 with the casting moved from the output of min to it's inputs. This is a non-issue on 64 bit machines, but if dolphin is compiled on an OS with size_t == u32 (say ARM) then remainingSize could be truncated. Restored the casting to the original order before dolphin-emu#334.
MikeRavenelle
pushed a commit
to MikeRavenelle/dolphin
that referenced
this pull request
Sep 2, 2014
Another issue from dolphin-emu#334 with the casting moved from the output of min to it's inputs. This is a non-issue on 64 bit machines, but if dolphin is compiled on an OS with size_t == u32 (say ARM) then remainingSize could be truncated. Restored the casting to the original order before dolphin-emu#334.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
The algorithm header defines these, so it seems a little redundant to keep these.