[pytango] 81/98: Fix windows compilation (issue #36, PR #39)
Sandor Bodo-Merle
sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:17:47 UTC 2017
This is an automated email from the git hooks/post-receive script.
sbodomerle-guest pushed a commit to tag v9.2.0
in repository pytango.
commit 066ec356bbe6784b4c911160a524bd05da479aed
Author: Tiago Coutinho <coutinhotiago at gmail.com>
Date: Fri Aug 12 10:37:52 2016 +0200
Fix windows compilation (issue #36, PR #39)
---
ext/device_pipe.cpp | 45 +++++++++++++++++++++++++++++++++++++--------
1 file changed, 37 insertions(+), 8 deletions(-)
diff --git a/ext/device_pipe.cpp b/ext/device_pipe.cpp
index 80da617..1c14e34 100644
--- a/ext/device_pipe.cpp
+++ b/ext/device_pipe.cpp
@@ -244,13 +244,6 @@ namespace PyTango
bopy::object
__extract_array(T& obj, size_t elt_idx, PyTango::ExtractAs extract_as)
{
- if (tangoArrayTypeConst == Tango::DEVVAR_LONGSTRINGARRAY ||
- tangoArrayTypeConst == Tango::DEVVAR_DOUBLESTRINGARRAY)
- {
- assert(false);
- return bopy::object();
- }
-
typedef typename TANGO_const2type(tangoArrayTypeConst) TangoArrayType;
TangoArrayType tmp_arr;
@@ -280,7 +273,43 @@ namespace PyTango
}
return data;
}
-
+
+ template <>
+ bopy::object
+ __extract_array<Tango::DevicePipe, Tango::DEVVAR_LONGSTRINGARRAY>
+ (Tango::DevicePipe& pipe, size_t elt_idx, PyTango::ExtractAs extract_as)
+ {
+ assert(false);
+ return bopy::object();
+ }
+
+ template <>
+ bopy::object
+ __extract_array<Tango::DevicePipe, Tango::DEVVAR_DOUBLESTRINGARRAY>
+ (Tango::DevicePipe& pipe, size_t elt_idx, PyTango::ExtractAs extract_as)
+ {
+ assert(false);
+ return bopy::object();
+ }
+
+ template <>
+ bopy::object
+ __extract_array<Tango::DevicePipeBlob, Tango::DEVVAR_LONGSTRINGARRAY>
+ (Tango::DevicePipeBlob& blob, size_t elt_idx, PyTango::ExtractAs extract_as)
+ {
+ assert(false);
+ return bopy::object();
+ }
+
+ template <>
+ bopy::object
+ __extract_array<Tango::DevicePipeBlob, Tango::DEVVAR_DOUBLESTRINGARRAY>
+ (Tango::DevicePipeBlob& blob, size_t elt_idx, PyTango::ExtractAs extract_as)
+ {
+ assert(false);
+ return bopy::object();
+ }
+
template <long tangoArrayTypeConst>
bopy::object
extract_array(Tango::DevicePipe& self, size_t elt_idx,
--
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