[SCM] Common Astronomy Software Applications core library branch, debian, updated. ffc6b6ab9b3f3319ac6eb63ceb502c812cc4533f

[Ole Streicher]

The following commit has been merged in the debian branch:
commit ffc6b6ab9b3f3319ac6eb63ceb502c812cc4533f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Sep 14 09:37:52 2012 +0200

    Compile with gcc-4.7, for unstable and quantal

diff --git a/debian/patches/Fix-build-with-gcc-4.7.patch b/debian/patches/Fix-build-with-gcc-4.7.patch
new file mode 100644
index 0000000..415f551
--- /dev/null
+++ b/debian/patches/Fix-build-with-gcc-4.7.patch
@@ -0,0 +1,54 @@
+Author: John Swinbank <swinbank at transientskp.org>
+Date: Wed, 27 Jun 2012 14:54:10 +0200
+Description: Fix build with gcc-4.7
+Bug: http://code.google.com/p/casacore/issues/detail?id=51
+Origin: upstream
+--- a/casa/Arrays/IPosition.h
++++ b/casa/Arrays/IPosition.h
+@@ -34,6 +34,7 @@
+ #include <casa/BasicSL/String.h>
+ #include <vector>
+ #include <cstddef>                  // for ptrdiff_t
++#include <unistd.h>
+ 
+ namespace casa { //# NAMESPACE CASA - BEGIN
+ 
+--- a/casa/System/Casarc.cc
++++ b/casa/System/Casarc.cc
+@@ -34,6 +34,7 @@
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ #include <cstdio>
++#include <unistd.h>
+ 
+ #define USE_FLOCK 0
+ #define CASARC_DEBUG 0
+--- a/scimath/Mathematics/ConvolveGridder.tcc
++++ b/scimath/Mathematics/ConvolveGridder.tcc
+@@ -305,11 +305,11 @@
+ 				    const Vector<Domain>& p,
+ 				    const Range& value)
+ {
+-  loc=location(loc,p);
++  loc=this->location(loc,p);
+   loc-=offsetVec;
+   if(onGrid(loc,supportVec)) {
+     Bool del;
+-    posVec=position(posVec, p);
++    posVec=this->position(posVec, p);
+     const IPosition& fs = gridded.shape();
+     vector<Int> s(fs.begin(), fs.end());
+     switch(loc.nelements()) {
+@@ -345,10 +345,10 @@
+ 				    const Vector<Domain>& p,
+ 				    Range& value)
+ {
+-  loc=location(loc,p); 
++  loc=this->location(loc,p);
+  if(onGrid(loc,supportVec)) {
+     Bool del;
+-    posVec=position(posVec, p);
++    posVec=this->position(posVec, p);
+     const IPosition& fs = gridded.shape();
+     vector<Int> s(fs.begin(), fs.end());
+     switch(loc.nelements()) {
diff --git a/debian/patches/series b/debian/patches/series
index 51fba18..dfaefa7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 set_soversion.patch
 dont_install_testscript_to_bin.patch
 multiarch.patch
+Fix-build-with-gcc-4.7.patch

-- 
Common Astronomy Software Applications core library