From d58a45d213bd7bde4d3341bd5377ca0e7ca5f090 Mon Sep 17 00:00:00 2001
From: Ger van Diepen <diepen@astron.nl>
Date: Tue, 5 Apr 2005 08:13:49 +0000
Subject: [PATCH] %[ER: 247]% Make it compile/link well with new dcomplex
---
CEP/CPA/PSS3/MNS/src/MeqMatrix.cc | 1 +
CEP/CPA/PSS3/MNS/src/MeqMatrixRealArr.cc | 9 +++++----
CEP/CPA/PSS3/MNS/src/MeqParmSingle.cc | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CEP/CPA/PSS3/MNS/src/MeqMatrix.cc b/CEP/CPA/PSS3/MNS/src/MeqMatrix.cc
index 7cb99fb89c4..654d5d82700 100644
--- a/CEP/CPA/PSS3/MNS/src/MeqMatrix.cc
+++ b/CEP/CPA/PSS3/MNS/src/MeqMatrix.cc
@@ -375,3 +375,4 @@ LOFAR::BlobIStream& operator>> (LOFAR::BlobIStream& bs, MeqMatrix& vec)
#include <casa/Utilities/Copy.cc>
#include <casa/Utilities/CountedPtr.cc>
template class Matrix<dcomplex>;
+template class Array<dcomplex>;
diff --git a/CEP/CPA/PSS3/MNS/src/MeqMatrixRealArr.cc b/CEP/CPA/PSS3/MNS/src/MeqMatrixRealArr.cc
index a1251d1c2d2..b34b48a125b 100644
--- a/CEP/CPA/PSS3/MNS/src/MeqMatrixRealArr.cc
+++ b/CEP/CPA/PSS3/MNS/src/MeqMatrixRealArr.cc
@@ -27,6 +27,7 @@
#include <MNS/MeqMatrixComplexArr.h>
#include <Common/Debug.h>
#include <casa/BasicSL/Constants.h>
+#include <cmath>
using namespace casa;
@@ -249,7 +250,7 @@ MeqMatrixRep* MeqMatrixRealArr::sin()
{
int n = nelements();
for (int i=0; i<n; i++) {
- itsValue[i] = ::sin(itsValue[i]);
+ itsValue[i] = std::sin(itsValue[i]);
}
return this;
}
@@ -258,7 +259,7 @@ MeqMatrixRep* MeqMatrixRealArr::cos()
{
int n = nelements();
for (int i=0; i<n; i++) {
- itsValue[i] = ::cos(itsValue[i]);
+ itsValue[i] = std::cos(itsValue[i]);
}
return this;
}
@@ -267,7 +268,7 @@ MeqMatrixRep* MeqMatrixRealArr::exp()
{
int n = nelements();
for (int i=0; i<n; i++) {
- itsValue[i] = ::exp(itsValue[i]);
+ itsValue[i] = std::exp(itsValue[i]);
}
return this;
}
@@ -285,7 +286,7 @@ MeqMatrixRep* MeqMatrixRealArr::sqrt()
{
int n = nelements();
for (int i=0; i<n; i++) {
- itsValue[i] = ::sqrt(itsValue[i]);
+ itsValue[i] = std::sqrt(itsValue[i]);
}
return this;
}
diff --git a/CEP/CPA/PSS3/MNS/src/MeqParmSingle.cc b/CEP/CPA/PSS3/MNS/src/MeqParmSingle.cc
index 6d711d5c8da..7f14ec20e91 100644
--- a/CEP/CPA/PSS3/MNS/src/MeqParmSingle.cc
+++ b/CEP/CPA/PSS3/MNS/src/MeqParmSingle.cc
@@ -25,6 +25,7 @@
#include <Common/Debug.h>
#include <Common/lofar_vector.h>
#include <casa/Utilities/BinarySearch.h>
+#include <cmath>
MeqParmSingle::MeqParmSingle (const string& name, double value)
--
GitLab