[pytango] 144/483: Added scope specifier bopy:: to len() in from_py.h Exchanged scope specifiers boost::python:: with bopy:: in attribute.cpp
Sandor Bodo-Merle
sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:14:34 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 66ba64ae822135cf96780d9e54c0f39293e962bb
Author: trogucki <trogucki at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date: Fri Sep 21 21:46:40 2012 +0000
Added scope specifier bopy:: to len() in from_py.h
Exchanged scope specifiers boost::python:: with bopy:: in attribute.cpp
git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@21163 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
src/from_py.h | 220 +++++++++++++++++++++++------------------------
src/server/attribute.cpp | 150 ++++++++++++++++----------------
2 files changed, 185 insertions(+), 185 deletions(-)
diff --git a/src/from_py.h b/src/from_py.h
index e0c0c21..e1e3e57 100644
--- a/src/from_py.h
+++ b/src/from_py.h
@@ -58,7 +58,7 @@ Tango::DevString PyString_AsCorbaString(PyObject* obj_ptr);
* @param[in] py_value python sequence object or a single string
* @param[out] result std string vector to be filled
*/
-void convert2array(const boost::python::object &py_value, StdStringVector & result);
+void convert2array(const bopy::object &py_value, StdStringVector & result);
/**
* Converter from python sequence of characters to a Tango::DevVarCharArray
@@ -66,7 +66,7 @@ void convert2array(const boost::python::object &py_value, StdStringVector & resu
* @param[in] py_value python sequence object or a single string
* @param[out] result Tango char array to be filled
*/
-void convert2array(const boost::python::object &py_value, Tango::DevVarCharArray & result);
+void convert2array(const bopy::object &py_value, Tango::DevVarCharArray & result);
/**
* Converter from python sequence to a Tango CORBA sequence
@@ -75,12 +75,12 @@ void convert2array(const boost::python::object &py_value, Tango::DevVarCharArray
* @param[out] result CORBA sequence to be filled
*/
template<typename TangoElementType>
-void convert2array(const boost::python::object &py_value, _CORBA_Sequence<TangoElementType> & result)
+void convert2array(const bopy::object &py_value, _CORBA_Sequence<TangoElementType> & result)
{
- size_t size = boost::python::len(py_value);
+ size_t size = bopy::len(py_value);
result.length(size);
for (size_t i=0; i < size; ++i) {
- TangoElementType ch = boost::python::extract<TangoElementType>(py_value[i]);
+ TangoElementType ch = bopy::extract<TangoElementType>(py_value[i]);
result[i] = ch;
}
}
@@ -92,7 +92,7 @@ void convert2array(const boost::python::object &py_value, _CORBA_Sequence<TangoE
* @param[in] py_value python sequence object or a single string
* @param[out] result Tango string array to be filled
*/
-void convert2array(const boost::python::object &py_value, Tango::DevVarStringArray & result);
+void convert2array(const bopy::object &py_value, Tango::DevVarStringArray & result);
inline void raise_convert2array_DevVarDoubleStringArray()
{
@@ -108,7 +108,7 @@ inline void raise_convert2array_DevVarDoubleStringArray()
* @param[in] py_value python sequence object
* @param[out] result Tango array to be filled
*/
-void convert2array(const boost::python::object &py_value, Tango::DevVarDoubleStringArray & result);
+void convert2array(const bopy::object &py_value, Tango::DevVarDoubleStringArray & result);
inline void raise_convert2array_DevVarLongStringArray()
{
@@ -124,7 +124,7 @@ inline void raise_convert2array_DevVarLongStringArray()
* @param[in] py_value python sequence object
* @param[out] result Tango array to be filled
*/
-void convert2array(const boost::python::object &py_value, Tango::DevVarLongStringArray & result);
+void convert2array(const bopy::object &py_value, Tango::DevVarLongStringArray & result);
/**
* Convert a python sequence into a C++ container
@@ -133,7 +133,7 @@ void convert2array(const boost::python::object &py_value, Tango::DevVarLongStrin
template <typename ContainerType = StdStringVector >
struct from_sequence
{
- static inline void convert(boost::python::object seq, ContainerType& a)
+ static inline void convert(bopy::object seq, ContainerType& a)
{
typedef typename ContainerType::value_type T;
PyObject *seq_ptr = seq.ptr();
@@ -141,13 +141,13 @@ struct from_sequence
for(Py_ssize_t i = 0; i < len; ++i)
{
PyObject *o_ptr = PySequence_GetItem(seq_ptr, i);
- T s = boost::python::extract<T>(o_ptr);
+ T s = bopy::extract<T>(o_ptr);
a.push_back(s);
- boost::python::decref(o_ptr);
+ bopy::decref(o_ptr);
}
}
- static inline void convert(boost::python::object seq, Tango::DbData& a)
+ static inline void convert(bopy::object seq, Tango::DbData& a)
{
PyObject *seq_ptr = seq.ptr();
Py_ssize_t len = PySequence_Length(seq_ptr);
@@ -182,27 +182,27 @@ struct from_sequence
* @param[in] d the python dictionary to be translated
* @param[out] db_data the array of DbDatum to be filled
*/
- static inline void convert(boost::python::dict d, Tango::DbData& db_data)
+ static inline void convert(bopy::dict d, Tango::DbData& db_data)
{
- boost::python::object it = d.iteritems();
- int len = boost::python::extract<int>(d.attr("__len__")()) ;
+ bopy::object it = d.iteritems();
+ int len = bopy::extract<int>(d.attr("__len__")()) ;
for(int i = 0 ; i < len; ++i)
{
- boost::python::tuple pair = (boost::python::tuple)it.attr("next")();
- boost::python::object key = pair[0];
- boost::python::object value = pair[1];
+ bopy::tuple pair = (bopy::tuple)it.attr("next")();
+ bopy::object key = pair[0];
+ bopy::object value = pair[1];
- boost::python::extract<Tango::DbDatum> ext(value);
+ bopy::extract<Tango::DbDatum> ext(value);
if(ext.check())
{
db_data.push_back(ext());
continue;
}
- char const* key_str = boost::python::extract<char const*>(key);
+ char const* key_str = bopy::extract<char const*>(key);
Tango::DbDatum db_datum(key_str);
- boost::python::extract<char const*> value_str(value);
+ bopy::extract<char const*> value_str(value);
if(value_str.check())
{
@@ -216,8 +216,8 @@ struct from_sequence
}
else
{
- boost::python::object str_value = value.attr("__str__")();
- boost::python::extract<char const*> str_value_str(str_value);
+ bopy::object str_value = value.attr("__str__")();
+ bopy::extract<char const*> str_value_str(str_value);
db_datum.value_string.push_back(str_value_str());
}
}
@@ -242,9 +242,9 @@ class CSequenceFromPython
SequenceT* m_seq;
bool m_own;
public:
- CSequenceFromPython(boost::python::object &py_obj)
+ CSequenceFromPython(bopy::object &py_obj)
{
- boost::python::extract<SequenceT*> ext(py_obj);
+ bopy::extract<SequenceT*> ext(py_obj);
if (ext.check()) {
m_seq = ext();
m_own = false;
@@ -279,18 +279,18 @@ class CSequenceFromPython
}
};
-void from_py_object(boost::python::object &, Tango::AttributeAlarm &);
-void from_py_object(boost::python::object &, Tango::ChangeEventProp &);
-void from_py_object(boost::python::object &, Tango::PeriodicEventProp &);
-void from_py_object(boost::python::object &, Tango::ArchiveEventProp &);
-void from_py_object(boost::python::object &, Tango::EventProperties &);
+void from_py_object(bopy::object &, Tango::AttributeAlarm &);
+void from_py_object(bopy::object &, Tango::ChangeEventProp &);
+void from_py_object(bopy::object &, Tango::PeriodicEventProp &);
+void from_py_object(bopy::object &, Tango::ArchiveEventProp &);
+void from_py_object(bopy::object &, Tango::EventProperties &);
-void from_py_object(boost::python::object &, Tango::AttributeConfig &);
-void from_py_object(boost::python::object &, Tango::AttributeConfig_2 &);
-void from_py_object(boost::python::object &, Tango::AttributeConfig_3 &);
+void from_py_object(bopy::object &, Tango::AttributeConfig &);
+void from_py_object(bopy::object &, Tango::AttributeConfig_2 &);
+void from_py_object(bopy::object &, Tango::AttributeConfig_3 &);
template<typename T>
-void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T> &multi_attr_prop)
+void from_py_object(bopy::object &py_obj, Tango::MultiAttrProp<T> &multi_attr_prop)
{
multi_attr_prop.label = bopy::extract<string>(bopy::str(py_obj.attr("label")));
multi_attr_prop.description = bopy::extract<string>(bopy::str(py_obj.attr("description")));
@@ -303,77 +303,77 @@ void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T> &mult
if(min_value.check())
multi_attr_prop.min_value = min_value();
else
- multi_attr_prop.min_value = boost::python::extract<T>(py_obj.attr("min_value"));
+ multi_attr_prop.min_value = bopy::extract<T>(py_obj.attr("min_value"));
bopy::extract<string> max_value(py_obj.attr("max_value"));
if(max_value.check())
multi_attr_prop.max_value = max_value();
else
- multi_attr_prop.max_value = boost::python::extract<T>(py_obj.attr("max_value"));
+ multi_attr_prop.max_value = bopy::extract<T>(py_obj.attr("max_value"));
bopy::extract<string> min_alarm(py_obj.attr("min_alarm"));
if(min_alarm.check())
multi_attr_prop.min_alarm = min_alarm();
else
- multi_attr_prop.min_alarm = boost::python::extract<T>(py_obj.attr("min_alarm"));
+ multi_attr_prop.min_alarm = bopy::extract<T>(py_obj.attr("min_alarm"));
bopy::extract<string> max_alarm(py_obj.attr("max_alarm"));
if(max_alarm.check())
multi_attr_prop.max_alarm = max_alarm();
else
- multi_attr_prop.max_alarm = boost::python::extract<T>(py_obj.attr("max_alarm"));
+ multi_attr_prop.max_alarm = bopy::extract<T>(py_obj.attr("max_alarm"));
bopy::extract<string> min_warning(py_obj.attr("min_warning"));
if(min_warning.check())
multi_attr_prop.min_warning = min_warning();
else
- multi_attr_prop.min_warning = boost::python::extract<T>(py_obj.attr("min_warning"));
+ multi_attr_prop.min_warning = bopy::extract<T>(py_obj.attr("min_warning"));
bopy::extract<string> max_warning(py_obj.attr("max_warning"));
if(max_warning.check())
multi_attr_prop.max_warning = max_warning();
else
- multi_attr_prop.max_warning = boost::python::extract<T>(py_obj.attr("max_warning"));
+ multi_attr_prop.max_warning = bopy::extract<T>(py_obj.attr("max_warning"));
bopy::extract<string> delta_t(py_obj.attr("delta_t"));
if(delta_t.check())
multi_attr_prop.delta_t = delta_t();
else
- multi_attr_prop.delta_t = boost::python::extract<Tango::DevLong>(py_obj.attr("delta_t")); // Property type is Tango::DevLong!
+ multi_attr_prop.delta_t = bopy::extract<Tango::DevLong>(py_obj.attr("delta_t")); // Property type is Tango::DevLong!
bopy::extract<string> delta_val(py_obj.attr("delta_val"));
if(delta_val.check())
multi_attr_prop.delta_val = delta_val();
else
- multi_attr_prop.delta_val = boost::python::extract<T>(py_obj.attr("delta_val"));
+ multi_attr_prop.delta_val = bopy::extract<T>(py_obj.attr("delta_val"));
bopy::extract<string> event_period(py_obj.attr("event_period"));
if(event_period.check())
multi_attr_prop.event_period = event_period();
else
- multi_attr_prop.event_period = boost::python::extract<Tango::DevLong>(py_obj.attr("event_period")); // Property type is Tango::DevLong!
+ multi_attr_prop.event_period = bopy::extract<Tango::DevLong>(py_obj.attr("event_period")); // Property type is Tango::DevLong!
bopy::extract<string> archive_period(py_obj.attr("archive_period"));
if(archive_period.check())
multi_attr_prop.archive_period = archive_period();
else
- multi_attr_prop.archive_period = boost::python::extract<Tango::DevLong>(py_obj.attr("archive_period")); // Property type is Tango::DevLong!
+ multi_attr_prop.archive_period = bopy::extract<Tango::DevLong>(py_obj.attr("archive_period")); // Property type is Tango::DevLong!
bopy::extract<string> rel_change(py_obj.attr("rel_change"));
if(rel_change.check())
multi_attr_prop.rel_change = rel_change();
else
{
- boost::python::object prop_py_obj = boost::python::object(py_obj.attr("rel_change"));
+ bopy::object prop_py_obj = bopy::object(py_obj.attr("rel_change"));
if(PySequence_Check(prop_py_obj.ptr()))
{
vector<Tango::DevDouble> change_vec;
- for(long i = 0; i < len(prop_py_obj); i++)
- change_vec.push_back(boost::python::extract<Tango::DevDouble>(prop_py_obj[i]));
+ for(long i = 0; i < bopy::len(prop_py_obj); i++)
+ change_vec.push_back(bopy::extract<Tango::DevDouble>(prop_py_obj[i]));
multi_attr_prop.rel_change = change_vec;
}
else
- multi_attr_prop.rel_change = boost::python::extract<Tango::DevDouble>(py_obj.attr("rel_change")); // Property type is Tango::DevDouble!
+ multi_attr_prop.rel_change = bopy::extract<Tango::DevDouble>(py_obj.attr("rel_change")); // Property type is Tango::DevDouble!
}
bopy::extract<string> abs_change(py_obj.attr("abs_change"));
@@ -381,16 +381,16 @@ void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T> &mult
multi_attr_prop.abs_change = abs_change();
else
{
- boost::python::object prop_py_obj = boost::python::object(py_obj.attr("abs_change"));
+ bopy::object prop_py_obj = bopy::object(py_obj.attr("abs_change"));
if(PySequence_Check(prop_py_obj.ptr()))
{
vector<Tango::DevDouble> change_vec;
- for(long i = 0; i < len(prop_py_obj); i++)
- change_vec.push_back(boost::python::extract<Tango::DevDouble>(prop_py_obj[i]));
+ for(long i = 0; i < bopy::len(prop_py_obj); i++)
+ change_vec.push_back(bopy::extract<Tango::DevDouble>(prop_py_obj[i]));
multi_attr_prop.abs_change = change_vec;
}
else
- multi_attr_prop.abs_change = boost::python::extract<Tango::DevDouble>(py_obj.attr("abs_change")); // Property type is Tango::DevDouble!
+ multi_attr_prop.abs_change = bopy::extract<Tango::DevDouble>(py_obj.attr("abs_change")); // Property type is Tango::DevDouble!
}
bopy::extract<string> archive_rel_change(py_obj.attr("archive_rel_change"));
@@ -398,16 +398,16 @@ void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T> &mult
multi_attr_prop.archive_rel_change = archive_rel_change();
else
{
- boost::python::object prop_py_obj = boost::python::object(py_obj.attr("archive_rel_change"));
+ bopy::object prop_py_obj = bopy::object(py_obj.attr("archive_rel_change"));
if(PySequence_Check(prop_py_obj.ptr()))
{
vector<Tango::DevDouble> change_vec;
- for(long i = 0; i < len(prop_py_obj); i++)
- change_vec.push_back(boost::python::extract<Tango::DevDouble>(prop_py_obj[i]));
+ for(long i = 0; i < bopy::len(prop_py_obj); i++)
+ change_vec.push_back(bopy::extract<Tango::DevDouble>(prop_py_obj[i]));
multi_attr_prop.archive_rel_change = change_vec;
}
else
- multi_attr_prop.archive_rel_change = boost::python::extract<Tango::DevDouble>(py_obj.attr("archive_rel_change")); // Property type is Tango::DevDouble!
+ multi_attr_prop.archive_rel_change = bopy::extract<Tango::DevDouble>(py_obj.attr("archive_rel_change")); // Property type is Tango::DevDouble!
}
bopy::extract<string> archive_abs_change(py_obj.attr("archive_abs_change"));
@@ -415,21 +415,21 @@ void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T> &mult
multi_attr_prop.archive_abs_change = archive_abs_change();
else
{
- boost::python::object prop_py_obj = boost::python::object(py_obj.attr("archive_abs_change"));
+ bopy::object prop_py_obj = bopy::object(py_obj.attr("archive_abs_change"));
if(PySequence_Check(prop_py_obj.ptr()))
{
vector<Tango::DevDouble> change_vec;
- for(long i = 0; i < len(prop_py_obj); i++)
- change_vec.push_back(boost::python::extract<Tango::DevDouble>(prop_py_obj[i]));
+ for(long i = 0; i < bopy::len(prop_py_obj); i++)
+ change_vec.push_back(bopy::extract<Tango::DevDouble>(prop_py_obj[i]));
multi_attr_prop.archive_abs_change = change_vec;
}
else
- multi_attr_prop.archive_abs_change = boost::python::extract<Tango::DevDouble>(py_obj.attr("archive_abs_change")); // Property type is Tango::DevDouble!
+ multi_attr_prop.archive_abs_change = bopy::extract<Tango::DevDouble>(py_obj.attr("archive_abs_change")); // Property type is Tango::DevDouble!
}
}
template<>
-inline void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<Tango::DevEncoded> &multi_attr_prop)
+inline void from_py_object(bopy::object &py_obj, Tango::MultiAttrProp<Tango::DevEncoded> &multi_attr_prop)
{
multi_attr_prop.label = bopy::extract<string>(bopy::str(py_obj.attr("label")));
multi_attr_prop.description = bopy::extract<string>(bopy::str(py_obj.attr("description")));
@@ -442,77 +442,77 @@ inline void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T
if(min_value.check())
multi_attr_prop.min_value = min_value();
else
- multi_attr_prop.min_value = boost::python::extract<Tango::DevUChar>(py_obj.attr("min_value"));
+ multi_attr_prop.min_value = bopy::extract<Tango::DevUChar>(py_obj.attr("min_value"));
bopy::extract<string> max_value(py_obj.attr("max_value"));
if(max_value.check())
multi_attr_prop.max_value = max_value();
else
- multi_attr_prop.max_value = boost::python::extract<Tango::DevUChar>(py_obj.attr("max_value"));
+ multi_attr_prop.max_value = bopy::extract<Tango::DevUChar>(py_obj.attr("max_value"));
bopy::extract<string> min_alarm(py_obj.attr("min_alarm"));
if(min_alarm.check())
multi_attr_prop.min_alarm = min_alarm();
else
- multi_attr_prop.min_alarm = boost::python::extract<Tango::DevUChar>(py_obj.attr("min_alarm"));
+ multi_attr_prop.min_alarm = bopy::extract<Tango::DevUChar>(py_obj.attr("min_alarm"));
bopy::extract<string> max_alarm(py_obj.attr("max_alarm"));
if(max_alarm.check())
multi_attr_prop.max_alarm = max_alarm();
else
- multi_attr_prop.max_alarm = boost::python::extract<Tango::DevUChar>(py_obj.attr("max_alarm"));
+ multi_attr_prop.max_alarm = bopy::extract<Tango::DevUChar>(py_obj.attr("max_alarm"));
bopy::extract<string> min_warning(py_obj.attr("min_warning"));
if(min_warning.check())
multi_attr_prop.min_warning = min_warning();
else
- multi_attr_prop.min_warning = boost::python::extract<Tango::DevUChar>(py_obj.attr("min_warning"));
+ multi_attr_prop.min_warning = bopy::extract<Tango::DevUChar>(py_obj.attr("min_warning"));
bopy::extract<string> max_warning(py_obj.attr("max_warning"));
if(max_warning.check())
multi_attr_prop.max_warning = max_warning();
else
- multi_attr_prop.max_warning = boost::python::extract<Tango::DevUChar>(py_obj.attr("max_warning"));
+ multi_attr_prop.max_warning = bopy::extract<Tango::DevUChar>(py_obj.attr("max_warning"));
bopy::extract<string> delta_t(py_obj.attr("delta_t"));
if(delta_t.check())
multi_attr_prop.delta_t = delta_t();
else
- multi_attr_prop.delta_t = boost::python::extract<Tango::DevLong>(py_obj.attr("delta_t")); // Property type is Tango::DevLong!
+ multi_attr_prop.delta_t = bopy::extract<Tango::DevLong>(py_obj.attr("delta_t")); // Property type is Tango::DevLong!
bopy::extract<string> delta_val(py_obj.attr("delta_val"));
if(delta_val.check())
multi_attr_prop.delta_val = delta_val();
else
- multi_attr_prop.delta_val = boost::python::extract<Tango::DevUChar>(py_obj.attr("delta_val"));
+ multi_attr_prop.delta_val = bopy::extract<Tango::DevUChar>(py_obj.attr("delta_val"));
bopy::extract<string> event_period(py_obj.attr("event_period"));
if(event_period.check())
multi_attr_prop.event_period = event_period();
else
- multi_attr_prop.event_period = boost::python::extract<Tango::DevLong>(py_obj.attr("event_period")); // Property type is Tango::DevLong!
+ multi_attr_prop.event_period = bopy::extract<Tango::DevLong>(py_obj.attr("event_period")); // Property type is Tango::DevLong!
bopy::extract<string> archive_period(py_obj.attr("archive_period"));
if(archive_period.check())
multi_attr_prop.archive_period = archive_period();
else
- multi_attr_prop.archive_period = boost::python::extract<Tango::DevLong>(py_obj.attr("archive_period")); // Property type is Tango::DevLong!
+ multi_attr_prop.archive_period = bopy::extract<Tango::DevLong>(py_obj.attr("archive_period")); // Property type is Tango::DevLong!
bopy::extract<string> rel_change(py_obj.attr("rel_change"));
if(rel_change.check())
multi_attr_prop.rel_change = rel_change();
else
{
- boost::python::object prop_py_obj = boost::python::object(py_obj.attr("rel_change"));
+ bopy::object prop_py_obj = bopy::object(py_obj.attr("rel_change"));
if(PySequence_Check(prop_py_obj.ptr()))
{
vector<Tango::DevDouble> change_vec;
- for(long i = 0; i < len(prop_py_obj); i++)
- change_vec.push_back(boost::python::extract<Tango::DevDouble>(prop_py_obj[i]));
+ for(long i = 0; i < bopy::len(prop_py_obj); i++)
+ change_vec.push_back(bopy::extract<Tango::DevDouble>(prop_py_obj[i]));
multi_attr_prop.rel_change = change_vec;
}
else
- multi_attr_prop.rel_change = boost::python::extract<Tango::DevDouble>(py_obj.attr("rel_change")); // Property type is Tango::DevDouble!
+ multi_attr_prop.rel_change = bopy::extract<Tango::DevDouble>(py_obj.attr("rel_change")); // Property type is Tango::DevDouble!
}
bopy::extract<string> abs_change(py_obj.attr("abs_change"));
@@ -520,16 +520,16 @@ inline void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T
multi_attr_prop.abs_change = abs_change();
else
{
- boost::python::object prop_py_obj = boost::python::object(py_obj.attr("abs_change"));
+ bopy::object prop_py_obj = bopy::object(py_obj.attr("abs_change"));
if(PySequence_Check(prop_py_obj.ptr()))
{
vector<Tango::DevDouble> change_vec;
- for(long i = 0; i < len(prop_py_obj); i++)
- change_vec.push_back(boost::python::extract<Tango::DevDouble>(prop_py_obj[i]));
+ for(long i = 0; i < bopy::len(prop_py_obj); i++)
+ change_vec.push_back(bopy::extract<Tango::DevDouble>(prop_py_obj[i]));
multi_attr_prop.abs_change = change_vec;
}
else
- multi_attr_prop.abs_change = boost::python::extract<Tango::DevDouble>(py_obj.attr("abs_change")); // Property type is Tango::DevDouble!
+ multi_attr_prop.abs_change = bopy::extract<Tango::DevDouble>(py_obj.attr("abs_change")); // Property type is Tango::DevDouble!
}
bopy::extract<string> archive_rel_change(py_obj.attr("archive_rel_change"));
@@ -537,16 +537,16 @@ inline void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T
multi_attr_prop.archive_rel_change = archive_rel_change();
else
{
- boost::python::object prop_py_obj = boost::python::object(py_obj.attr("archive_rel_change"));
+ bopy::object prop_py_obj = bopy::object(py_obj.attr("archive_rel_change"));
if(PySequence_Check(prop_py_obj.ptr()))
{
vector<Tango::DevDouble> change_vec;
- for(long i = 0; i < len(prop_py_obj); i++)
- change_vec.push_back(boost::python::extract<Tango::DevDouble>(prop_py_obj[i]));
+ for(long i = 0; i < bopy::len(prop_py_obj); i++)
+ change_vec.push_back(bopy::extract<Tango::DevDouble>(prop_py_obj[i]));
multi_attr_prop.archive_rel_change = change_vec;
}
else
- multi_attr_prop.archive_rel_change = boost::python::extract<Tango::DevDouble>(py_obj.attr("archive_rel_change")); // Property type is Tango::DevDouble!
+ multi_attr_prop.archive_rel_change = bopy::extract<Tango::DevDouble>(py_obj.attr("archive_rel_change")); // Property type is Tango::DevDouble!
}
bopy::extract<string> archive_abs_change(py_obj.attr("archive_abs_change"));
@@ -554,21 +554,21 @@ inline void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T
multi_attr_prop.archive_abs_change = archive_abs_change();
else
{
- boost::python::object prop_py_obj = boost::python::object(py_obj.attr("archive_abs_change"));
+ bopy::object prop_py_obj = bopy::object(py_obj.attr("archive_abs_change"));
if(PySequence_Check(prop_py_obj.ptr()))
{
vector<Tango::DevDouble> change_vec;
- for(long i = 0; i < len(prop_py_obj); i++)
- change_vec.push_back(boost::python::extract<Tango::DevDouble>(prop_py_obj[i]));
+ for(long i = 0; i < bopy::len(prop_py_obj); i++)
+ change_vec.push_back(bopy::extract<Tango::DevDouble>(prop_py_obj[i]));
multi_attr_prop.archive_abs_change = change_vec;
}
else
- multi_attr_prop.archive_abs_change = boost::python::extract<Tango::DevDouble>(py_obj.attr("archive_abs_change")); // Property type is Tango::DevDouble!
+ multi_attr_prop.archive_abs_change = bopy::extract<Tango::DevDouble>(py_obj.attr("archive_abs_change")); // Property type is Tango::DevDouble!
}
}
template<>
-inline void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<Tango::DevString> &multi_attr_prop)
+inline void from_py_object(bopy::object &py_obj, Tango::MultiAttrProp<Tango::DevString> &multi_attr_prop)
{
string empty_str("");
@@ -619,7 +619,7 @@ inline void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T
if(delta_t.check())
multi_attr_prop.delta_t = delta_t();
else
- multi_attr_prop.delta_t = boost::python::extract<Tango::DevLong>(py_obj.attr("delta_t")); // Property type is Tango::DevLong!
+ multi_attr_prop.delta_t = bopy::extract<Tango::DevLong>(py_obj.attr("delta_t")); // Property type is Tango::DevLong!
bopy::extract<string> delta_val(py_obj.attr("delta_val"));
if(delta_val.check())
@@ -631,29 +631,29 @@ inline void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T
if(event_period.check())
multi_attr_prop.event_period = event_period();
else
- multi_attr_prop.event_period = boost::python::extract<Tango::DevLong>(py_obj.attr("event_period")); // Property type is Tango::DevLong!
+ multi_attr_prop.event_period = bopy::extract<Tango::DevLong>(py_obj.attr("event_period")); // Property type is Tango::DevLong!
bopy::extract<string> archive_period(py_obj.attr("archive_period"));
if(archive_period.check())
multi_attr_prop.archive_period = archive_period();
else
- multi_attr_prop.archive_period = boost::python::extract<Tango::DevLong>(py_obj.attr("archive_period")); // Property type is Tango::DevLong!
+ multi_attr_prop.archive_period = bopy::extract<Tango::DevLong>(py_obj.attr("archive_period")); // Property type is Tango::DevLong!
bopy::extract<string> rel_change(py_obj.attr("rel_change"));
if(rel_change.check())
multi_attr_prop.rel_change = rel_change();
else
{
- boost::python::object prop_py_obj = boost::python::object(py_obj.attr("rel_change"));
+ bopy::object prop_py_obj = bopy::object(py_obj.attr("rel_change"));
if(PySequence_Check(prop_py_obj.ptr()))
{
vector<Tango::DevDouble> change_vec;
- for(long i = 0; i < len(prop_py_obj); i++)
- change_vec.push_back(boost::python::extract<Tango::DevDouble>(prop_py_obj[i]));
+ for(long i = 0; i < bopy::len(prop_py_obj); i++)
+ change_vec.push_back(bopy::extract<Tango::DevDouble>(prop_py_obj[i]));
multi_attr_prop.rel_change = change_vec;
}
else
- multi_attr_prop.rel_change = boost::python::extract<Tango::DevDouble>(py_obj.attr("rel_change")); // Property type is Tango::DevDouble!
+ multi_attr_prop.rel_change = bopy::extract<Tango::DevDouble>(py_obj.attr("rel_change")); // Property type is Tango::DevDouble!
}
bopy::extract<string> abs_change(py_obj.attr("abs_change"));
@@ -661,16 +661,16 @@ inline void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T
multi_attr_prop.abs_change = abs_change();
else
{
- boost::python::object prop_py_obj = boost::python::object(py_obj.attr("abs_change"));
+ bopy::object prop_py_obj = bopy::object(py_obj.attr("abs_change"));
if(PySequence_Check(prop_py_obj.ptr()))
{
vector<Tango::DevDouble> change_vec;
- for(long i = 0; i < len(prop_py_obj); i++)
- change_vec.push_back(boost::python::extract<Tango::DevDouble>(prop_py_obj[i]));
+ for(long i = 0; i < bopy::len(prop_py_obj); i++)
+ change_vec.push_back(bopy::extract<Tango::DevDouble>(prop_py_obj[i]));
multi_attr_prop.abs_change = change_vec;
}
else
- multi_attr_prop.abs_change = boost::python::extract<Tango::DevDouble>(py_obj.attr("abs_change")); // Property type is Tango::DevDouble!
+ multi_attr_prop.abs_change = bopy::extract<Tango::DevDouble>(py_obj.attr("abs_change")); // Property type is Tango::DevDouble!
}
bopy::extract<string> archive_rel_change(py_obj.attr("archive_rel_change"));
@@ -678,16 +678,16 @@ inline void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T
multi_attr_prop.archive_rel_change = archive_rel_change();
else
{
- boost::python::object prop_py_obj = boost::python::object(py_obj.attr("archive_rel_change"));
+ bopy::object prop_py_obj = bopy::object(py_obj.attr("archive_rel_change"));
if(PySequence_Check(prop_py_obj.ptr()))
{
vector<Tango::DevDouble> change_vec;
- for(long i = 0; i < len(prop_py_obj); i++)
- change_vec.push_back(boost::python::extract<Tango::DevDouble>(prop_py_obj[i]));
+ for(long i = 0; i < bopy::len(prop_py_obj); i++)
+ change_vec.push_back(bopy::extract<Tango::DevDouble>(prop_py_obj[i]));
multi_attr_prop.archive_rel_change = change_vec;
}
else
- multi_attr_prop.archive_rel_change = boost::python::extract<Tango::DevDouble>(py_obj.attr("archive_rel_change")); // Property type is Tango::DevDouble!
+ multi_attr_prop.archive_rel_change = bopy::extract<Tango::DevDouble>(py_obj.attr("archive_rel_change")); // Property type is Tango::DevDouble!
}
bopy::extract<string> archive_abs_change(py_obj.attr("archive_abs_change"));
@@ -695,19 +695,19 @@ inline void from_py_object(boost::python::object &py_obj, Tango::MultiAttrProp<T
multi_attr_prop.archive_abs_change = archive_abs_change();
else
{
- boost::python::object prop_py_obj = boost::python::object(py_obj.attr("archive_abs_change"));
+ bopy::object prop_py_obj = bopy::object(py_obj.attr("archive_abs_change"));
if(PySequence_Check(prop_py_obj.ptr()))
{
vector<Tango::DevDouble> change_vec;
- for(long i = 0; i < len(prop_py_obj); i++)
- change_vec.push_back(boost::python::extract<Tango::DevDouble>(prop_py_obj[i]));
+ for(long i = 0; i < bopy::len(prop_py_obj); i++)
+ change_vec.push_back(bopy::extract<Tango::DevDouble>(prop_py_obj[i]));
multi_attr_prop.archive_abs_change = change_vec;
}
else
- multi_attr_prop.archive_abs_change = boost::python::extract<Tango::DevDouble>(py_obj.attr("archive_abs_change")); // Property type is Tango::DevDouble!
+ multi_attr_prop.archive_abs_change = bopy::extract<Tango::DevDouble>(py_obj.attr("archive_abs_change")); // Property type is Tango::DevDouble!
}
}
-void from_py_object(boost::python::object &, Tango::AttributeConfigList &);
-void from_py_object(boost::python::object &, Tango::AttributeConfigList_2 &);
-void from_py_object(boost::python::object &, Tango::AttributeConfigList_3 &);
+void from_py_object(bopy::object &, Tango::AttributeConfigList &);
+void from_py_object(bopy::object &, Tango::AttributeConfigList_2 &);
+void from_py_object(bopy::object &, Tango::AttributeConfigList_3 &);
diff --git a/src/server/attribute.cpp b/src/server/attribute.cpp
index ef3d383..50af607 100644
--- a/src/server/attribute.cpp
+++ b/src/server/attribute.cpp
@@ -80,7 +80,7 @@ namespace PyAttribute
*/
template<long tangoTypeConst>
inline void __set_value_scalar(Tango::Attribute &att,
- boost::python::object &value)
+ bopy::object &value)
{
typedef typename TANGO_const2type(tangoTypeConst) TangoScalarType;
@@ -110,7 +110,7 @@ namespace PyAttribute
/*
template<>
inline void __set_value_scalar<Tango::DEV_STRING>(Tango::Attribute &att,
- boost::python::object &value)
+ bopy::object &value)
{
Tango::DevString *v = new Tango::DevString;
@@ -136,8 +136,8 @@ namespace PyAttribute
* @param data new attribute data
*/
inline void __set_value(Tango::Attribute &att,
- boost::python::str &data_str,
- boost::python::str &data)
+ bopy::str &data_str,
+ bopy::str &data)
{
extract<Tango::DevString> val_str(data_str.ptr());
if (!val_str.check())
@@ -166,7 +166,7 @@ namespace PyAttribute
*/
template<long tangoTypeConst>
inline void __set_value_date_quality_scalar(Tango::Attribute &att,
- boost::python::object &value,
+ bopy::object &value,
double t, Tango::AttrQuality quality)
{
typedef typename TANGO_const2type(tangoTypeConst) TangoScalarType;
@@ -202,7 +202,7 @@ namespace PyAttribute
/*
template<>
inline void __set_value_date_quality_scalar<Tango::DEV_STRING>(Tango::Attribute &att,
- boost::python::object &value,
+ bopy::object &value,
double t, Tango::AttrQuality quality)
{
PYTG_NEW_TIME_FROM_DOUBLE(t, tv);
@@ -230,8 +230,8 @@ namespace PyAttribute
* @param quality attribute quality
*/
inline void __set_value_date_quality(Tango::Attribute &att,
- boost::python::str &data_str,
- boost::python::str &data,
+ bopy::str &data_str,
+ bopy::str &data,
double t, Tango::AttrQuality quality)
{
extract<Tango::DevString> val_str(data_str.ptr());
@@ -255,7 +255,7 @@ namespace PyAttribute
template<long tangoTypeConst>
void __set_value_date_quality_array(
Tango::Attribute& att,
- boost::python::object &value,
+ bopy::object &value,
double time,
Tango::AttrQuality* quality,
long* x,
@@ -302,7 +302,7 @@ namespace PyAttribute
- inline void __set_value(const std::string & fname, Tango::Attribute &att, boost::python::object &value, long* x, long *y, double t = 0.0, Tango::AttrQuality* quality = 0)
+ inline void __set_value(const std::string & fname, Tango::Attribute &att, bopy::object &value, long* x, long *y, double t = 0.0, Tango::AttrQuality* quality = 0)
{
long type = att.get_data_type();
Tango::AttrDataFormat format = att.get_data_format();
@@ -341,7 +341,7 @@ namespace PyAttribute
}
}
- inline void __set_value(const std::string & fname, Tango::Attribute &att, boost::python::str &data_str, boost::python::str &data, double t = 0.0, Tango::AttrQuality* quality = 0)
+ inline void __set_value(const std::string & fname, Tango::Attribute &att, bopy::str &data_str, bopy::str &data, double t = 0.0, Tango::AttrQuality* quality = 0)
{
if (quality)
__set_value_date_quality(att, data_str, data, t, *quality);
@@ -349,63 +349,63 @@ namespace PyAttribute
__set_value(att, data_str, data);
}
- inline void set_value(Tango::Attribute &att, boost::python::object &value)
+ inline void set_value(Tango::Attribute &att, bopy::object &value)
{ __set_value("set_value", att, value, 0, 0); }
inline void set_value(Tango::Attribute &att, Tango::EncodedAttribute *data)
{ att.set_value(data); }
- inline void set_value(Tango::Attribute &att, boost::python::str &data_str, boost::python::str &data)
+ inline void set_value(Tango::Attribute &att, bopy::str &data_str, bopy::str &data)
{ __set_value("set_value", att, data_str, data); }
- inline void set_value(Tango::Attribute &att, boost::python::object &value, long x)
+ inline void set_value(Tango::Attribute &att, bopy::object &value, long x)
{ __set_value("set_value", att, value, &x, 0); }
- inline void set_value(Tango::Attribute &att, boost::python::object &value, long x, long y)
+ inline void set_value(Tango::Attribute &att, bopy::object &value, long x, long y)
{ __set_value("set_value", att, value, &x, &y); }
inline void set_value_date_quality(Tango::Attribute &att,
- boost::python::object &value, double t,
+ bopy::object &value, double t,
Tango::AttrQuality quality)
{ __set_value("set_value_date_quality", att, value, 0, 0, t, &quality); }
inline void set_value_date_quality(Tango::Attribute &att,
- boost::python::str &data_str,
- boost::python::str &data,
+ bopy::str &data_str,
+ bopy::str &data,
double t,
Tango::AttrQuality quality)
{ __set_value("set_value_date_quality", att, data_str, data, t, &quality); }
inline void set_value_date_quality(Tango::Attribute &att,
- boost::python::object &value,
+ bopy::object &value,
double t, Tango::AttrQuality quality,
long x)
{ __set_value("set_value_date_quality", att, value, &x, 0, t, &quality); }
inline void set_value_date_quality(Tango::Attribute &att,
- boost::python::object &value,
+ bopy::object &value,
double t, Tango::AttrQuality quality,
long x, long y)
{ __set_value("set_value_date_quality", att, value, &x, &y, t, &quality); }
- inline boost::python::object get_properties(Tango::Attribute &att,
- boost::python::object &attr_cfg)
+ inline bopy::object get_properties(Tango::Attribute &att,
+ bopy::object &attr_cfg)
{
Tango::AttributeConfig tg_attr_cfg;
att.get_properties(tg_attr_cfg);
return to_py(tg_attr_cfg, attr_cfg);
}
- inline boost::python::object get_properties_2(Tango::Attribute &att,
- boost::python::object &attr_cfg)
+ inline bopy::object get_properties_2(Tango::Attribute &att,
+ bopy::object &attr_cfg)
{
Tango::AttributeConfig_2 tg_attr_cfg;
att.get_properties_2(tg_attr_cfg);
return to_py(tg_attr_cfg, attr_cfg);
}
- inline boost::python::object get_properties_3(Tango::Attribute &att,
- boost::python::object &attr_cfg)
+ inline bopy::object get_properties_3(Tango::Attribute &att,
+ bopy::object &attr_cfg)
{
Tango::AttributeConfig_3 tg_attr_cfg;
att.get_properties_3(tg_attr_cfg);
@@ -413,7 +413,7 @@ namespace PyAttribute
}
template<typename TangoScalarType>
- inline void _get_properties_multi_attr_prop(Tango::Attribute &att, boost::python::object &multi_attr_prop)
+ inline void _get_properties_multi_attr_prop(Tango::Attribute &att, bopy::object &multi_attr_prop)
{
Tango::MultiAttrProp<TangoScalarType> tg_multi_attr_prop;
att.get_properties(tg_multi_attr_prop);
@@ -425,7 +425,7 @@ namespace PyAttribute
// This is a hook dealing with a bug in Tango 8.0.5 related to AttrProp<Tango::DevString> specialisation
template<>
- inline void _get_properties_multi_attr_prop<Tango::DevString>(Tango::Attribute &att, boost::python::object &multi_attr_prop)
+ inline void _get_properties_multi_attr_prop<Tango::DevString>(Tango::Attribute &att, bopy::object &multi_attr_prop)
{
Tango::AttributeConfig_3 tg_attr_cfg;
att.get_properties_3(tg_attr_cfg);
@@ -460,16 +460,16 @@ namespace PyAttribute
#endif // _get_properties_multi_attr_prop<Tango::DevString>
- inline boost::python::object get_properties_multi_attr_prop(Tango::Attribute &att,
- boost::python::object &multi_attr_prop)
+ inline bopy::object get_properties_multi_attr_prop(Tango::Attribute &att,
+ bopy::object &multi_attr_prop)
{
long tangoTypeConst = att.get_data_type();
TANGO_CALL_ON_ATTRIBUTE_DATA_TYPE_NAME(tangoTypeConst, _get_properties_multi_attr_prop, att, multi_attr_prop);
return multi_attr_prop;
}
- void set_properties(Tango::Attribute &att, boost::python::object &attr_cfg,
- boost::python::object &dev)
+ void set_properties(Tango::Attribute &att, bopy::object &attr_cfg,
+ bopy::object &dev)
{
Tango::AttributeConfig tg_attr_cfg;
from_py_object(attr_cfg, tg_attr_cfg);
@@ -477,8 +477,8 @@ namespace PyAttribute
att.set_properties(tg_attr_cfg, dev_ptr);
}
- void set_properties_3(Tango::Attribute &att, boost::python::object &attr_cfg,
- boost::python::object &dev)
+ void set_properties_3(Tango::Attribute &att, bopy::object &attr_cfg,
+ bopy::object &dev)
{
Tango::AttributeConfig_3 tg_attr_cfg;
from_py_object(attr_cfg, tg_attr_cfg);
@@ -487,31 +487,31 @@ namespace PyAttribute
}
template<typename TangoScalarType>
- inline void _set_properties_multi_attr_prop(Tango::Attribute &att, boost::python::object &multi_attr_prop)
+ inline void _set_properties_multi_attr_prop(Tango::Attribute &att, bopy::object &multi_attr_prop)
{
Tango::MultiAttrProp<TangoScalarType> tg_multi_attr_prop;
from_py_object(multi_attr_prop,tg_multi_attr_prop);
att.set_properties(tg_multi_attr_prop);
}
- void set_properties_multi_attr_prop(Tango::Attribute &att, boost::python::object &multi_attr_prop)
+ void set_properties_multi_attr_prop(Tango::Attribute &att, bopy::object &multi_attr_prop)
{
long tangoTypeConst = att.get_data_type();
TANGO_CALL_ON_ATTRIBUTE_DATA_TYPE_NAME(tangoTypeConst, _set_properties_multi_attr_prop, att, multi_attr_prop);
}
- void set_upd_properties(Tango::Attribute &att, boost::python::object &attr_cfg)
+ void set_upd_properties(Tango::Attribute &att, bopy::object &attr_cfg)
{
Tango::AttributeConfig_3 tg_attr_cfg;
from_py_object(attr_cfg, tg_attr_cfg);
att.set_upd_properties(tg_attr_cfg);
}
- void set_upd_properties(Tango::Attribute &att, boost::python::object &attr_cfg, boost::python::object &dev_name)
+ void set_upd_properties(Tango::Attribute &att, bopy::object &attr_cfg, bopy::object &dev_name)
{
Tango::AttributeConfig_3 tg_attr_cfg;
from_py_object(attr_cfg, tg_attr_cfg);
- string tg_dev_name = boost::python::extract<string>(dev_name);
+ string tg_dev_name = bopy::extract<string>(dev_name);
att.set_upd_properties(tg_attr_cfg,tg_dev_name);
}
@@ -522,7 +522,7 @@ namespace PyAttribute
inline void fire_change_event(Tango::Attribute &self, object &data)
{
- boost::python::extract<Tango::DevFailed> except_convert(data);
+ bopy::extract<Tango::DevFailed> except_convert(data);
if (except_convert.check()) {
self.fire_change_event(
const_cast<Tango::DevFailed*>( &except_convert() ));
@@ -547,16 +547,16 @@ namespace PyAttribute
template<typename TangoScalarType>
- inline void _set_min_alarm(Tango::Attribute &self, boost::python::object value)
+ inline void _set_min_alarm(Tango::Attribute &self, bopy::object value)
{
- TangoScalarType c_value = boost::python::extract<TangoScalarType>(value);
+ TangoScalarType c_value = bopy::extract<TangoScalarType>(value);
self.set_min_alarm(c_value);
}
#if TgLibVersNb < 80100 // set_min_alarm
template<>
- inline void _set_min_alarm<Tango::DevEncoded>(Tango::Attribute &self, boost::python::object value)
+ inline void _set_min_alarm<Tango::DevEncoded>(Tango::Attribute &self, bopy::object value)
{
string err_msg = "Attribute properties cannot be set with Tango::DevEncoded data type";
Tango::Except::throw_exception((const char *)"API_MethodArgument",
@@ -566,7 +566,7 @@ namespace PyAttribute
#endif // set_min_alarm
- inline void set_min_alarm(Tango::Attribute &self, boost::python::object value)
+ inline void set_min_alarm(Tango::Attribute &self, bopy::object value)
{
bopy::extract<string> value_convert(value);
@@ -590,16 +590,16 @@ namespace PyAttribute
template<typename TangoScalarType>
- inline void _set_max_alarm(Tango::Attribute &self, boost::python::object value)
+ inline void _set_max_alarm(Tango::Attribute &self, bopy::object value)
{
- TangoScalarType c_value = boost::python::extract<TangoScalarType>(value);
+ TangoScalarType c_value = bopy::extract<TangoScalarType>(value);
self.set_max_alarm(c_value);
}
#if TgLibVersNb < 80100 // set_max_alarm
template<>
- inline void _set_max_alarm<Tango::DevEncoded>(Tango::Attribute &self, boost::python::object value)
+ inline void _set_max_alarm<Tango::DevEncoded>(Tango::Attribute &self, bopy::object value)
{
string err_msg = "Attribute properties cannot be set with Tango::DevEncoded data type";
Tango::Except::throw_exception((const char *)"API_MethodArgument",
@@ -609,7 +609,7 @@ namespace PyAttribute
#endif // set_max_alarm
- inline void set_max_alarm(Tango::Attribute &self, boost::python::object value)
+ inline void set_max_alarm(Tango::Attribute &self, bopy::object value)
{
bopy::extract<string> value_convert(value);
@@ -633,16 +633,16 @@ namespace PyAttribute
template<typename TangoScalarType>
- inline void _set_min_warning(Tango::Attribute &self, boost::python::object value)
+ inline void _set_min_warning(Tango::Attribute &self, bopy::object value)
{
- TangoScalarType c_value = boost::python::extract<TangoScalarType>(value);
+ TangoScalarType c_value = bopy::extract<TangoScalarType>(value);
self.set_min_warning(c_value);
}
#if TgLibVersNb < 80100 // set_min_warning
template<>
- inline void _set_min_warning<Tango::DevEncoded>(Tango::Attribute &self, boost::python::object value)
+ inline void _set_min_warning<Tango::DevEncoded>(Tango::Attribute &self, bopy::object value)
{
string err_msg = "Attribute properties cannot be set with Tango::DevEncoded data type";
Tango::Except::throw_exception((const char *)"API_MethodArgument",
@@ -652,7 +652,7 @@ namespace PyAttribute
#endif // set_min_warning
- inline void set_min_warning(Tango::Attribute &self, boost::python::object value)
+ inline void set_min_warning(Tango::Attribute &self, bopy::object value)
{
bopy::extract<string> value_convert(value);
@@ -676,16 +676,16 @@ namespace PyAttribute
template<typename TangoScalarType>
- inline void _set_max_warning(Tango::Attribute &self, boost::python::object value)
+ inline void _set_max_warning(Tango::Attribute &self, bopy::object value)
{
- TangoScalarType c_value = boost::python::extract<TangoScalarType>(value);
+ TangoScalarType c_value = bopy::extract<TangoScalarType>(value);
self.set_max_warning(c_value);
}
#if TgLibVersNb < 80100 // set_max_warning
template<>
- inline void _set_max_warning<Tango::DevEncoded>(Tango::Attribute &self, boost::python::object value)
+ inline void _set_max_warning<Tango::DevEncoded>(Tango::Attribute &self, bopy::object value)
{
string err_msg = "Attribute properties cannot be set with Tango::DevEncoded data type";
Tango::Except::throw_exception((const char *)"API_MethodArgument",
@@ -695,7 +695,7 @@ namespace PyAttribute
#endif // set_max_warning
- inline void set_max_warning(Tango::Attribute &self, boost::python::object value)
+ inline void set_max_warning(Tango::Attribute &self, bopy::object value)
{
bopy::extract<string> value_convert(value);
@@ -724,9 +724,9 @@ namespace PyAttribute
TangoScalarType tg_val;
att.get_min_alarm(tg_val);
- boost::python::object py_value(tg_val);
+ bopy::object py_value(tg_val);
- return boost::python::incref(py_value.ptr());
+ return bopy::incref(py_value.ptr());
}
PyObject *get_min_alarm(Tango::Attribute &att)
@@ -747,9 +747,9 @@ namespace PyAttribute
TangoScalarType tg_val;
att.get_max_alarm(tg_val);
- boost::python::object py_value(tg_val);
+ bopy::object py_value(tg_val);
- return boost::python::incref(py_value.ptr());
+ return bopy::incref(py_value.ptr());
}
PyObject *get_max_alarm(Tango::Attribute &att)
@@ -770,9 +770,9 @@ namespace PyAttribute
TangoScalarType tg_val;
att.get_min_warning(tg_val);
- boost::python::object py_value(tg_val);
+ bopy::object py_value(tg_val);
- return boost::python::incref(py_value.ptr());
+ return bopy::incref(py_value.ptr());
}
PyObject *get_min_warning(Tango::Attribute &att)
@@ -793,9 +793,9 @@ namespace PyAttribute
TangoScalarType tg_val;
att.get_max_warning(tg_val);
- boost::python::object py_value(tg_val);
+ bopy::object py_value(tg_val);
- return boost::python::incref(py_value.ptr());
+ return bopy::incref(py_value.ptr());
}
PyObject *get_max_warning(Tango::Attribute &att)
@@ -888,31 +888,31 @@ void export_attribute()
&PyAttribute::get_max_warning)
.def("set_value",
- (void (*) (Tango::Attribute &, boost::python::object &))
+ (void (*) (Tango::Attribute &, bopy::object &))
&PyAttribute::set_value)
.def("set_value",
- (void (*) (Tango::Attribute &, boost::python::str &, boost::python::str &))
+ (void (*) (Tango::Attribute &, bopy::str &, bopy::str &))
&PyAttribute::set_value)
.def("set_value",
(void (*) (Tango::Attribute &, Tango::EncodedAttribute *))
&PyAttribute::set_value)
.def("set_value",
- (void (*) (Tango::Attribute &, boost::python::object &, long))
+ (void (*) (Tango::Attribute &, bopy::object &, long))
&PyAttribute::set_value)
.def("set_value",
- (void (*) (Tango::Attribute &, boost::python::object &, long, long))
+ (void (*) (Tango::Attribute &, bopy::object &, long, long))
&PyAttribute::set_value)
.def("set_value_date_quality",
- (void (*) (Tango::Attribute &, boost::python::object &, double t, Tango::AttrQuality quality))
+ (void (*) (Tango::Attribute &, bopy::object &, double t, Tango::AttrQuality quality))
&PyAttribute::set_value_date_quality)
.def("set_value_date_quality",
- (void (*) (Tango::Attribute &, boost::python::str &, boost::python::str &, double t, Tango::AttrQuality quality))
+ (void (*) (Tango::Attribute &, bopy::str &, bopy::str &, double t, Tango::AttrQuality quality))
&PyAttribute::set_value_date_quality)
.def("set_value_date_quality",
- (void (*) (Tango::Attribute &, boost::python::object &, double t, Tango::AttrQuality quality, long))
+ (void (*) (Tango::Attribute &, bopy::object &, double t, Tango::AttrQuality quality, long))
&PyAttribute::set_value_date_quality)
.def("set_value_date_quality",
- (void (*) (Tango::Attribute &, boost::python::object &, double t, Tango::AttrQuality quality, long, long))
+ (void (*) (Tango::Attribute &, bopy::object &, double t, Tango::AttrQuality quality, long, long))
&PyAttribute::set_value_date_quality)
.def("set_change_event", &Tango::Attribute::set_change_event,
@@ -938,18 +938,18 @@ void export_attribute()
.def("_set_properties_multi_attr_prop", &PyAttribute::set_properties_multi_attr_prop)
.def("set_upd_properties",
- (void (*) (Tango::Attribute &, boost::python::object &))
+ (void (*) (Tango::Attribute &, bopy::object &))
&PyAttribute::set_upd_properties)
.def("set_upd_properties",
- (void (*) (Tango::Attribute &, boost::python::object &, boost::python::object &))
+ (void (*) (Tango::Attribute &, bopy::object &, bopy::object &))
&PyAttribute::set_upd_properties)
.def("fire_change_event",
(void (*) (Tango::Attribute &))
&PyAttribute::fire_change_event)
.def("fire_change_event",
- (void (*) (Tango::Attribute &, boost::python::object &))
+ (void (*) (Tango::Attribute &, bopy::object &))
&PyAttribute::fire_change_event)
;
}
--
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