Repository: casacore/python-casacore (language: python)

Issue:
Fix compilation due to recent casacore and gcc changes



Discussion / hints:

Fix patch:
diff --git a/src/pyimages.cc b/src/pyimages.cc
index 5d6a0462..53f9a386 100755
--- a/src/pyimages.cc
+++ b/src/pyimages.cc
@@ -45,7 +45,7 @@ namespace casacore { namespace python {
 	    // 2 arg: concat from image names
       .def (init<Vector<String>, Int>())
             // 3 arg: open image or image expression
-      .def (init<String, String, vector<ImageProxy> >())
+      .def (init<String, String, std::vector<ImageProxy> >())
 	    // 4 arg: concat from images objects
       .def (init<std::vector<ImageProxy>, Int, Int, Int>())
             // 8 arg: create image from array


Test patch:
diff --git a/tests/tConvert.cc b/tests/tConvert.cc
index db74ec43..830656ee 100644
--- a/tests/tConvert.cc
+++ b/tests/tConvert.cc
@@ -26,12 +26,17 @@
 //#
 //# $Id: tConvert.cc,v 1.4 2006/11/06 00:14:44 gvandiep Exp $
 
+#include <casacore/casa/version.h>
 #include <casacore/python/Converters/PycExcp.h>
 #include <casacore/python/Converters/PycBasicData.h>
 #include <casacore/python/Converters/PycValueHolder.h>
 #include <casacore/python/Converters/PycRecord.h>
 #include <casacore/python/Converters/PycArray.h>
+#if CASACORE_MAJOR_VERSION < 3 || \
+    (CASACORE_MAJOR_VERSION == 3 && CASACORE_MINOR_VERSION < 4)
+// This include disappeared in the arrays refactor for casacore 3.4.0
 #include <casacore/casa/Arrays/ArrayIO.h>
+#endif
 #include <casacore/casa/BasicSL/STLIO.h>
 #include <casacore/casa/Exceptions/Error.h>