diff options
| author | Derek Kim <bluewhale8202@gmail.com> | 2018-09-11 15:03:46 +0900 |
|---|---|---|
| committer | Derek Kim <bluewhale8202@gmail.com> | 2018-09-11 15:03:46 +0900 |
| commit | 566eddfc4c27e4f30941e4ba9d908abb9a449a51 (patch) | |
| tree | 0595b5404d0cf41d07c6fa4c7d954ff19346fd00 | |
| parent | 6ab8bd1673c402e454e51cde4fa5531b7519b4ae (diff) | |
| download | numpy-566eddfc4c27e4f30941e4ba9d908abb9a449a51.tar.gz | |
DOC: #defining -> #define
| -rw-r--r-- | doc/release/1.7.0-notes.rst | 12 | ||||
| -rw-r--r-- | numpy/core/include/numpy/npy_1_7_deprecated_api.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/release/1.7.0-notes.rst b/doc/release/1.7.0-notes.rst index 09e6924e6..a95d0c1cd 100644 --- a/doc/release/1.7.0-notes.rst +++ b/doc/release/1.7.0-notes.rst @@ -1,6 +1,6 @@ -========================= -NumPy 1.7.0 Release Notes -========================= +=========================== + NumPy 1.7.0 Release Notes +=========================== This release includes several new features as well as numerous bug fixes and refactorings. It supports Python 2.4 - 2.7 and 3.1 - 3.3 and is the last @@ -280,9 +280,9 @@ The macros in old_defines.h are deprecated and will be removed in the next major release (>= 2.0). The sed script tools/replace_old_macros.sed can be used to replace these macros with the newer versions. -You can test your code against the deprecated C API by #defining -NPY_NO_DEPRECATED_API to the target version number, for example -NPY_1_7_API_VERSION, before including any NumPy headers. +You can test your code against the deprecated C API by adding a line +composed of ``#define NPY_NO_DEPRECATED_API`` and the target version number +such as ``NPY_1_7_API_VERSION``, before including any NumPy headers. The ``NPY_CHAR`` member of the ``NPY_TYPES`` enum is deprecated and will be removed in NumPy 1.8. See the discussion at diff --git a/numpy/core/include/numpy/npy_1_7_deprecated_api.h b/numpy/core/include/numpy/npy_1_7_deprecated_api.h index 02b08a78b..76b57b748 100644 --- a/numpy/core/include/numpy/npy_1_7_deprecated_api.h +++ b/numpy/core/include/numpy/npy_1_7_deprecated_api.h @@ -12,8 +12,8 @@ #pragma message(_WARN___LOC__"Using deprecated NumPy API, disable it with " \ "#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION") #elif defined(__GNUC__) -#warning "Using deprecated NumPy API, disable it by " \ - "#defining NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION" +#warning "Using deprecated NumPy API, disable it with " \ + "#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION" #endif /* TODO: How to do this warning message for other compilers? */ |