casa / casa6 / 678248a2a03

Commits

Merge branch 'CAS-13875' into CAS-13857

Modified

1 1	#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
2 2
3 3	#include <casaswig_types.h>
4 4	#include <swigconvert_python.h>
5 5	#include <Python.h>
6 6	#include <string.h>
7 7	#if USING_NUMPY_ARRAYS
8 8	#include <numpy/arrayobject.h>
9 9	#endif
10 10	#include <patchlevel.h>
11 11
12 -	#include <stdcasa/StdCasa/string_conversions>
12 +	#include <stdcasa/StdCasa/string_conversions.hpp>
13 13	#include <iostream>
14 14
15 15	STRINGTOCOMPLEX_DEFINITION(casac::complex,stringtoccomplex)
16 16
17 17	#ifndef PyInt_Check
18 18	// support for python3
19 19	#define PyInt_Check PyLong_Check
20 20	#define PyInt_FromLong PyLong_FromLong
21 21	#define PyInt_FromUnsignedLong PyLong_FromUnsignedLong
22 22	#define PyInt_AsLong PyLong_AsLong