diff options
| author | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
|---|---|---|
| committer | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
| commit | 4fa56874ba1557274c10077bf8386ece4c61dbd6 (patch) | |
| tree | e2d336604e960b548e996d2e7dcfc5a1e1401b9e /mp/src/mathlib/mathlib_base.cpp | |
| parent | Added DS_Store to .gitignore. (diff) | |
| parent | Make libSDL2.so/dylib into symlinks. (diff) | |
| download | source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.tar.xz source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.zip | |
Merge remote-tracking branch 'upstream/master'
Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings
for .gitignore and .gitattributes.
Diffstat (limited to 'mp/src/mathlib/mathlib_base.cpp')
| -rw-r--r-- | mp/src/mathlib/mathlib_base.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mp/src/mathlib/mathlib_base.cpp b/mp/src/mathlib/mathlib_base.cpp index a403ccfa..15c51963 100644 --- a/mp/src/mathlib/mathlib_base.cpp +++ b/mp/src/mathlib/mathlib_base.cpp @@ -4244,7 +4244,7 @@ FPExceptionDisabler::FPExceptionDisabler() // Retrieve the current state of the exception flags. This // must be done before changing them. _MCW_EM is a bit // mask representing all available exception masks. - _controlfp_s(&mOldValues, _MCW_EM, _MCW_EM); + _controlfp_s(&mOldValues, 0, 0); // Set all of the exception flags, which suppresses FP // exceptions on the x87 and SSE units. _controlfp_s(0, _MCW_EM, _MCW_EM); @@ -4269,7 +4269,7 @@ FPExceptionEnabler::FPExceptionEnabler(unsigned int enableBits /*= _EM_OVERFLOW // Retrieve the current state of the exception flags. This // must be done before changing them. _MCW_EM is a bit // mask representing all available exception masks. - _controlfp_s(&mOldValues, _MCW_EM, _MCW_EM); + _controlfp_s(&mOldValues, 0, 0); // Make sure no non-exception flags have been specified, // to avoid accidental changing of rounding modes, etc. |