[Numpy-svn] [numpy/numpy] adbd6d: BUG: #6922: Fix segfault introduced in 23901aa.

[GitHub]

  Branch: refs/heads/maintenance/1.10.x
  Home:   https://github.com/numpy/numpy
  Commit: adbd6db171c4cb5864abeee078b8c62d0684a6ad
      https://github.com/numpy/numpy/commit/adbd6db171c4cb5864abeee078b8c62d0684a6ad
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2016-01-02 (Sat, 02 Jan 2016)

  Changed paths:
    M numpy/core/src/multiarray/arraytypes.c.src

  Log Message:
  -----------
  BUG: #6922:  Fix segfault introduced in 23901aa.

Revert troublesome parts of gh-5929. Copyswap cannot be relied
upon for void types containing objects.


  Commit: 00d7499212f26385fc8732ebc7828cdcf0cef514
      https://github.com/numpy/numpy/commit/00d7499212f26385fc8732ebc7828cdcf0cef514
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2016-01-02 (Sat, 02 Jan 2016)

  Changed paths:
    M numpy/core/tests/test_regression.py

  Log Message:
  -----------
  TST: Add regression test for gh-6922.

Sorting and unaligned void type should not segfault.


  Commit: 114836b1632c80d663700439307cfb0844e35578
      https://github.com/numpy/numpy/commit/114836b1632c80d663700439307cfb0844e35578
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2016-01-02 (Sat, 02 Jan 2016)

  Changed paths:
    M numpy/core/src/multiarray/arraytypes.c.src
    M numpy/core/tests/test_regression.py

  Log Message:
  -----------
  Merge pull request #6925 from charris/backport-6924

Backport 6924


Compare: https://github.com/numpy/numpy/compare/cd48c065fc36...114836b1632c