Changeset 41b985f for python/ext/py-cvec.c

Timestamp:

Mar 12, 2017, 11:26:24 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

bde49c4a

Parents:

71f2e5f (diff), 67b6618 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'origin/master' into sampler

Conflicts:

.travis.yml
Makefile
examples/aubionotes.c
examples/parse_args.h
python/demos/demo_timestretch_online.py
python/lib/moresetuptools.py
python/tests/test_source.py
setup.py
src/io/source.c

File:

• python/ext/py-cvec.c (modified) (2 diffs)

python/ext/py-cvec.c

@@ -148 +148 @@
   if (length != vec->length) {
     PyErr_Format (PyExc_ValueError,
-        "input array has length %ld, but cvec has length %d", length,
+        "input array has length %" NPY_INTP_FMT ", but cvec has length %d", length,
         vec->length);
     return 1;
@@ -169 +169 @@
   if (length != vec->length) {
     PyErr_Format (PyExc_ValueError,
-        "input array has length %ld, but cvec has length %d", length,
+        "input array has length %" NPY_INTP_FMT ", but cvec has length %d", length,
         vec->length);
     return 1;