[Numpy-svn] [numpy/numpy] fbf549: BUG: mask nan to 1 in ordered compare

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: fbf549b9c2912a356dfeb71f3a411874879c9556
      https://github.com/numpy/numpy/commit/fbf549b9c2912a356dfeb71f3a411874879c9556
  Author: Julian Taylor <jtaylor.debian at googlemail.com>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M numpy/core/src/umath/simd.inc.src

  Log Message:
  -----------
  BUG: mask nan to 1 in ordered compare

msvc2008 32 bit seems to miscompile it otherwise.
closes gh-6428


  Commit: 696ccc47af8ef9e7fab96ec425b8676150b26d13
      https://github.com/numpy/numpy/commit/696ccc47af8ef9e7fab96ec425b8676150b26d13
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M numpy/core/src/umath/simd.inc.src

  Log Message:
  -----------
  Merge pull request #6438 from juliantaylor/msvc-workaround

BUG: mask nan to 1 in ordered compare


Compare: https://github.com/numpy/numpy/compare/014e631a370b...696ccc47af8e