From 70949d40ec0f69e8595e39e38f5042adb9fd4eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=BCrges?= <jurges@astron.nl>
Date: Fri, 12 Apr 2019 15:27:07 +0000
Subject: [PATCH] SW-610: Change namespace casa:: to casacore::
---
LCS/Blob/include/Blob/BlobArray.tcc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/LCS/Blob/include/Blob/BlobArray.tcc b/LCS/Blob/include/Blob/BlobArray.tcc
index 23c2fc094fc..14115df10e9 100644
--- a/LCS/Blob/include/Blob/BlobArray.tcc
+++ b/LCS/Blob/include/Blob/BlobArray.tcc
@@ -159,28 +159,28 @@ BlobIStream& operator>> (BlobIStream& bs, blitz::Array<T,NDIM>& arr)
#if defined(HAVE_AIPSPP)
template<typename T>
-BlobOStream& operator<< (BlobOStream& bs, const casa::Array<T>& arr)
+BlobOStream& operator<< (BlobOStream& bs, const casacore::Array<T>& arr)
{
bool deleteIt;
const T* data = arr.getStorage(deleteIt);
- const casa::IPosition& shape = arr.shape();
- vector<uint64> shp(shape.begin(), shape.end());
+ const casacore::IPosition& shape = arr.shape();
+ std::vector<uint64> shp(shape.begin(), shape.end());
putBlobArray (bs, data, shp.empty() ? 0 : &shp[0], arr.ndim(), true);
arr.freeStorage (data, deleteIt);
return bs;
}
template<typename T>
-BlobIStream& operator>> (BlobIStream& bs, casa::Array<T>& arr)
+BlobIStream& operator>> (BlobIStream& bs, casacore::Array<T>& arr)
{
bs.getStart (LOFAR::typeName((const T**)0));
bool fortranOrder;
uint16 ndim;
uint nalign = getBlobArrayStart (bs, fortranOrder, ndim);
- vector<uint64> shp(ndim);
+ std::vector<uint64> shp(ndim);
getBlobArrayShape (bs, ndim==0 ? 0 : &shp[0], ndim,
!fortranOrder, nalign);
- casa::IPosition shape(ndim);
+ casacore::IPosition shape(ndim);
for (uint i=0; i<ndim; i++) {
shape[i] = shp[i];
}
--
GitLab