[pytango] 353/483: fix compilation warnings
Sandor Bodo-Merle
sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:14:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.
commit 1b490f60dce745a5b5a6c39c95c62ac51df4acf1
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date: Thu Feb 6 19:08:06 2014 +0000
fix compilation warnings
git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@24862 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
src/boost/cpp/device_attribute.h | 4 ----
src/boost/cpp/fast_from_py.h | 3 +--
src/boost/cpp/fast_from_py_numpy.hpp | 1 -
src/boost/cpp/server/attribute.cpp | 1 -
src/boost/cpp/to_py_numpy.hpp | 2 --
5 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/boost/cpp/device_attribute.h b/src/boost/cpp/device_attribute.h
index fa40a23..2bf3952 100644
--- a/src/boost/cpp/device_attribute.h
+++ b/src/boost/cpp/device_attribute.h
@@ -175,10 +175,6 @@ namespace PyDeviceAttribute {
template<>
inline void _fill_scalar_attribute<Tango::DEV_ENCODED>(Tango::DeviceAttribute & dev_attr, const boost::python::object & py_value)
{
- static const long tangoTypeConst = Tango::DEV_ENCODED;
- typedef TANGO_const2type(tangoTypeConst) TangoScalarType;
- typedef TANGO_const2arraytype(tangoTypeConst) TangoArrayType;
-
/// @todo test it!!
/// @todo Now I am accepting 2 strings: encoded_format, encoded_data. This
diff --git a/src/boost/cpp/fast_from_py.h b/src/boost/cpp/fast_from_py.h
index 4329aae..4abce71 100644
--- a/src/boost/cpp/fast_from_py.h
+++ b/src/boost/cpp/fast_from_py.h
@@ -281,8 +281,7 @@ inline typename TANGO_const2type(tangoTypeConst)*
fast_python_to_tango_buffer_sequence(PyObject* py_val, long* pdim_x, long *pdim_y, const std::string &fname, bool isImage, long& res_dim_x, long& res_dim_y)
{
typedef typename TANGO_const2type(tangoTypeConst) TangoScalarType;
- typedef typename TANGO_const2arraytype(tangoTypeConst) TangoArrayType;
-
+
long dim_x;
long dim_y = 0;
Py_ssize_t len = PySequence_Size(py_val);
diff --git a/src/boost/cpp/fast_from_py_numpy.hpp b/src/boost/cpp/fast_from_py_numpy.hpp
index 6fd6cb8..7f24054 100644
--- a/src/boost/cpp/fast_from_py_numpy.hpp
+++ b/src/boost/cpp/fast_from_py_numpy.hpp
@@ -33,7 +33,6 @@ inline typename TANGO_const2type(tangoScalarTypeConst)*
fast_python_to_tango_buffer_numpy(PyObject* py_val, long* pdim_x, long* pdim_y, const std::string &fname, bool isImage, long& res_dim_x, long& res_dim_y)
{
typedef typename TANGO_const2type(tangoScalarTypeConst) TangoScalarType;
- typedef typename TANGO_const2arraytype(tangoScalarTypeConst) TangoArrayType;
static const int typenum = TANGO_const2numpy(tangoScalarTypeConst);
if (!PyArray_Check(py_val)) {
diff --git a/src/boost/cpp/server/attribute.cpp b/src/boost/cpp/server/attribute.cpp
index 0e88137..705bb59 100644
--- a/src/boost/cpp/server/attribute.cpp
+++ b/src/boost/cpp/server/attribute.cpp
@@ -252,7 +252,6 @@ namespace PyAttribute
bool isImage)
{
typedef typename TANGO_const2type(tangoTypeConst) TangoScalarType;
- typedef typename TANGO_const2arraytype(tangoTypeConst) TangoArrayType;
if (!PySequence_Check(value.ptr()))
{
diff --git a/src/boost/cpp/to_py_numpy.hpp b/src/boost/cpp/to_py_numpy.hpp
index 2574d76..f5a49c2 100644
--- a/src/boost/cpp/to_py_numpy.hpp
+++ b/src/boost/cpp/to_py_numpy.hpp
@@ -17,8 +17,6 @@
template <long tangoArrayTypeConst>
inline boost::python::object to_py_numpy(const typename TANGO_const2type(tangoArrayTypeConst)* tg_array, boost::python::object parent)
{
- typedef typename TANGO_const2type(tangoArrayTypeConst) TangoArrayType;
-
static const int typenum = TANGO_const2scalarnumpy(tangoArrayTypeConst);
if (tg_array == 0) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git
More information about the debian-science-commits
mailing list