diff options
| author | Ron Economos <w6rz@comcast.net> | 2020-06-28 13:19:24 -0700 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-06-29 07:41:05 -0400 |
| commit | aff75a94fef87f3d6b39df19429e2388c5d07bc0 (patch) | |
| tree | 064b8d9626871138a1467a2f8fc6a2e6e8aa40bb | |
| parent | 467f3c127bc9059d8d210dbae72350627b732f8b (diff) | |
gr-qtgui: Replace PyLong_AsLong with PyLong_AsLongLong for 32-bit systems.
17 files changed, 52 insertions, 34 deletions
diff --git a/gr-qtgui/python/qtgui/bindings/ber_sink_b_python.cc b/gr-qtgui/python/qtgui/bindings/ber_sink_b_python.cc index da8dce680f..2ba5a21217 100644 --- a/gr-qtgui/python/qtgui/bindings/ber_sink_b_python.cc +++ b/gr-qtgui/python/qtgui/bindings/ber_sink_b_python.cc @@ -59,10 +59,12 @@ void bind_ber_sink_b(py::module& m) // D(ber_sink_b,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", - [](std::shared_ptr<ber_sink_b> p) { return PyLong_AsLong(p->pyqwidget()); }, + [](std::shared_ptr<ber_sink_b> p) { + return PyLong_AsLongLong(p->pyqwidget()); + }, D(ber_sink_b, pyqwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/const_sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/const_sink_c_python.cc index f273282046..0411614c8a 100644 --- a/gr-qtgui/python/qtgui/bindings/const_sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/const_sink_c_python.cc @@ -63,10 +63,12 @@ void bind_const_sink_c(py::module& m) // D(const_sink_c,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", - [](std::shared_ptr<const_sink_c> p) { return PyLong_AsLong(p->pyqwidget()); }, + [](std::shared_ptr<const_sink_c> p) { + return PyLong_AsLongLong(p->pyqwidget()); + }, D(const_sink_c, pyqwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc index 8ca2b4413f..d2962adaa6 100644 --- a/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc @@ -67,10 +67,12 @@ void bind_eye_sink_c(py::module& m) // D(eye_sink_c,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", - [](std::shared_ptr<eye_sink_c> p) { return PyLong_AsLong(p->pyqwidget()); }, + [](std::shared_ptr<eye_sink_c> p) { + return PyLong_AsLongLong(p->pyqwidget()); + }, D(eye_sink_c, pyqwidget)) .def("set_y_axis", diff --git a/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc index 76d52917e7..fceff081ed 100644 --- a/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc @@ -64,10 +64,12 @@ void bind_eye_sink_f(py::module& m) // D(eye_sink_f,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", - [](std::shared_ptr<eye_sink_f> p) { return PyLong_AsLong(p->pyqwidget()); }, + [](std::shared_ptr<eye_sink_f> p) { + return PyLong_AsLongLong(p->pyqwidget()); + }, D(eye_sink_f, pyqwidget)) .def("set_y_axis", diff --git a/gr-qtgui/python/qtgui/bindings/freq_sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/freq_sink_c_python.cc index 43b9ec2cc8..f1e4c1b8f0 100644 --- a/gr-qtgui/python/qtgui/bindings/freq_sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/freq_sink_c_python.cc @@ -66,10 +66,12 @@ void bind_freq_sink_c(py::module& m) // D(freq_sink_c,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", - [](std::shared_ptr<freq_sink_c> p) { return PyLong_AsLong(p->pyqwidget()); }, + [](std::shared_ptr<freq_sink_c> p) { + return PyLong_AsLongLong(p->pyqwidget()); + }, D(freq_sink_c, pyqwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/freq_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/freq_sink_f_python.cc index 7371e4afd4..d753986f61 100644 --- a/gr-qtgui/python/qtgui/bindings/freq_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/freq_sink_f_python.cc @@ -66,10 +66,12 @@ void bind_freq_sink_f(py::module& m) // D(freq_sink_f,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", - [](std::shared_ptr<freq_sink_f> p) { return PyLong_AsLong(p->pyqwidget()); }, + [](std::shared_ptr<freq_sink_f> p) { + return PyLong_AsLongLong(p->pyqwidget()); + }, D(freq_sink_f, pyqwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/histogram_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/histogram_sink_f_python.cc index 6ddef112e5..704c4a37d4 100644 --- a/gr-qtgui/python/qtgui/bindings/histogram_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/histogram_sink_f_python.cc @@ -67,11 +67,11 @@ void bind_histogram_sink_f(py::module& m) // D(histogram_sink_f,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", [](std::shared_ptr<histogram_sink_f> p) { - return PyLong_AsLong(p->pyqwidget()); + return PyLong_AsLongLong(p->pyqwidget()); }, D(histogram_sink_f, pyqwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/number_sink_python.cc b/gr-qtgui/python/qtgui/bindings/number_sink_python.cc index e753d333a4..042069aded 100644 --- a/gr-qtgui/python/qtgui/bindings/number_sink_python.cc +++ b/gr-qtgui/python/qtgui/bindings/number_sink_python.cc @@ -64,10 +64,12 @@ void bind_number_sink(py::module& m) // D(number_sink,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", - [](std::shared_ptr<number_sink> p) { return PyLong_AsLong(p->pyqwidget()); }, + [](std::shared_ptr<number_sink> p) { + return PyLong_AsLongLong(p->pyqwidget()); + }, D(number_sink, pyqwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/sink_c_python.cc index 67efaed3db..39315217f7 100644 --- a/gr-qtgui/python/qtgui/bindings/sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/sink_c_python.cc @@ -66,10 +66,10 @@ void bind_sink_c(py::module& m) // D(sink_c,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", - [](std::shared_ptr<sink_c> p) { return PyLong_AsLong(p->pyqwidget()); }, + [](std::shared_ptr<sink_c> p) { return PyLong_AsLongLong(p->pyqwidget()); }, D(sink_c, pyqwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/sink_f_python.cc index 7bb98f0ec3..4c71bb2813 100644 --- a/gr-qtgui/python/qtgui/bindings/sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/sink_f_python.cc @@ -66,10 +66,10 @@ void bind_sink_f(py::module& m) // D(sink_f,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", - [](std::shared_ptr<sink_f> p) { return PyLong_AsLong(p->pyqwidget()); }, + [](std::shared_ptr<sink_f> p) { return PyLong_AsLongLong(p->pyqwidget()); }, D(sink_f, pyqwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/time_raster_sink_b_python.cc b/gr-qtgui/python/qtgui/bindings/time_raster_sink_b_python.cc index 558e5a7220..d713330eec 100644 --- a/gr-qtgui/python/qtgui/bindings/time_raster_sink_b_python.cc +++ b/gr-qtgui/python/qtgui/bindings/time_raster_sink_b_python.cc @@ -68,11 +68,11 @@ void bind_time_raster_sink_b(py::module& m) // D(time_raster_sink_b,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", [](std::shared_ptr<time_raster_sink_b> p) { - return PyLong_AsLong(p->pyqwidget()); + return PyLong_AsLongLong(p->pyqwidget()); }, D(time_raster_sink_b, pyqwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/time_raster_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/time_raster_sink_f_python.cc index 02b4f27aba..662265ef3b 100644 --- a/gr-qtgui/python/qtgui/bindings/time_raster_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/time_raster_sink_f_python.cc @@ -68,11 +68,11 @@ void bind_time_raster_sink_f(py::module& m) // D(time_raster_sink_f,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", [](std::shared_ptr<time_raster_sink_f> p) { - return PyLong_AsLong(p->pyqwidget()); + return PyLong_AsLongLong(p->pyqwidget()); }, D(time_raster_sink_f, pyqwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/time_sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/time_sink_c_python.cc index 1c1a026446..29ebd25f9f 100644 --- a/gr-qtgui/python/qtgui/bindings/time_sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/time_sink_c_python.cc @@ -67,10 +67,12 @@ void bind_time_sink_c(py::module& m) // D(time_sink_c,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", - [](std::shared_ptr<time_sink_c> p) { return PyLong_AsLong(p->pyqwidget()); }, + [](std::shared_ptr<time_sink_c> p) { + return PyLong_AsLongLong(p->pyqwidget()); + }, D(time_sink_c, pyqwidget)) .def("set_y_axis", diff --git a/gr-qtgui/python/qtgui/bindings/time_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/time_sink_f_python.cc index 799e3827bb..c7b6374127 100644 --- a/gr-qtgui/python/qtgui/bindings/time_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/time_sink_f_python.cc @@ -64,10 +64,12 @@ void bind_time_sink_f(py::module& m) // D(time_sink_f,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", - [](std::shared_ptr<time_sink_f> p) { return PyLong_AsLong(p->pyqwidget()); }, + [](std::shared_ptr<time_sink_f> p) { + return PyLong_AsLongLong(p->pyqwidget()); + }, D(time_sink_f, pyqwidget)) .def("set_y_axis", diff --git a/gr-qtgui/python/qtgui/bindings/vector_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/vector_sink_f_python.cc index 4e815209fc..119ac14ac8 100644 --- a/gr-qtgui/python/qtgui/bindings/vector_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/vector_sink_f_python.cc @@ -67,11 +67,11 @@ void bind_vector_sink_f(py::module& m) // D(vector_sink_f,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", [](std::shared_ptr<vector_sink_f> p) { - return PyLong_AsLong(p->pyqwidget()); + return PyLong_AsLongLong(p->pyqwidget()); }, D(vector_sink_f, pyqwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/waterfall_sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/waterfall_sink_c_python.cc index 2bca9829a5..c596946ef9 100644 --- a/gr-qtgui/python/qtgui/bindings/waterfall_sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/waterfall_sink_c_python.cc @@ -67,11 +67,11 @@ void bind_waterfall_sink_c(py::module& m) // D(waterfall_sink_c,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", [](std::shared_ptr<waterfall_sink_c> p) { - return PyLong_AsLong(p->pyqwidget()); + return PyLong_AsLongLong(p->pyqwidget()); }, D(waterfall_sink_c, pyqwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/waterfall_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/waterfall_sink_f_python.cc index 5a5da8caae..2e84054c3b 100644 --- a/gr-qtgui/python/qtgui/bindings/waterfall_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/waterfall_sink_f_python.cc @@ -67,11 +67,11 @@ void bind_waterfall_sink_f(py::module& m) // D(waterfall_sink_f,pyqwidget) // ) // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to Long + // needs to be explicitly converted to long long. .def( "pyqwidget", [](std::shared_ptr<waterfall_sink_f> p) { - return PyLong_AsLong(p->pyqwidget()); + return PyLong_AsLongLong(p->pyqwidget()); }, D(waterfall_sink_f, pyqwidget)) |