diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-27 05:42:06 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-27 05:42:06 +0000 |
| commit | c691d55bcdd09081bb18d7ee88983175470f7249 (patch) | |
| tree | 705aef9e5624c904317f94b4a2a0c89472f760c5 /insns.def | |
| parent | 6792751d4f134d7c97495c5b5044df3b03f6ba5a (diff) | |
* numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le, flo_eql): revert
isnan() checks for VC++6.
* insns.def (opt_lt, opt_gt): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insns.def')
| -rw-r--r-- | insns.def | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -1676,7 +1676,13 @@ opt_lt else if (HEAP_CLASS_OF(recv) == rb_cFloat && HEAP_CLASS_OF(obj) == rb_cFloat && BASIC_OP_UNREDEFINED_P(BOP_LT)) { - val = RFLOAT_VALUE(recv) < RFLOAT_VALUE(obj) ? Qtrue : Qfalse; + double a = RFLOAT_VALUE(recv); + double b = RFLOAT_VALUE(obj); +#if defined(_MSC_VER) && _MSC_VER < 1300 + if (isnan(a) || isnan(b)) val = Qfalse; + else +#endif + val = a < b ? Qtrue : Qfalse; } #endif else { @@ -1750,7 +1756,13 @@ opt_gt else if (HEAP_CLASS_OF(recv) == rb_cFloat && HEAP_CLASS_OF(obj) == rb_cFloat && BASIC_OP_UNREDEFINED_P(BOP_GT)) { - val = RFLOAT_VALUE(recv) > RFLOAT_VALUE(obj) ? Qtrue : Qfalse; + double a = RFLOAT_VALUE(recv); + double b = RFLOAT_VALUE(obj); +#if defined(_MSC_VER) && _MSC_VER < 1300 + if (isnan(a) || isnan(b)) val = Qfalse; + else +#endif + val = a > b ? Qtrue : Qfalse; } #endif else { |