From 639905f638a2bdca7687eabfcbd881a51209d0f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Offringa?= <offringa@astron.nl>
Date: Tue, 26 Apr 2011 14:06:34 +0000
Subject: [PATCH] Bug 1491: fixing issues with std::abs vs. abs macro defined
in Fortran
---
CEP/DP3/AOFlagger/include/AOFlagger/f2c.h | 18 +++++++++---------
.../include/AOFlagger/msio/antennainfo.h | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/f2c.h b/CEP/DP3/AOFlagger/include/AOFlagger/f2c.h
index b94ee7c8e12..3f3096d47b7 100644
--- a/CEP/DP3/AOFlagger/include/AOFlagger/f2c.h
+++ b/CEP/DP3/AOFlagger/include/AOFlagger/f2c.h
@@ -154,15 +154,15 @@ struct Namelist {
};
typedef struct Namelist Namelist;
-#define abs(x) ((x) >= 0 ? (x) : -(x))
-#define dabs(x) (doublereal)abs(x)
-#define min(a,b) ((a) <= (b) ? (a) : (b))
-#define max(a,b) ((a) >= (b) ? (a) : (b))
-#define dmin(a,b) (doublereal)min(a,b)
-#define dmax(a,b) (doublereal)max(a,b)
-#define bit_test(a,b) ((a) >> (b) & 1)
-#define bit_clear(a,b) ((a) & ~((uinteger)1 << (b)))
-#define bit_set(a,b) ((a) | ((uinteger)1 << (b)))
+//#define abs(x) ((x) >= 0 ? (x) : -(x))
+//#define dabs(x) (doublereal)abs(x)
+//#define min(a,b) ((a) <= (b) ? (a) : (b))
+//#define max(a,b) ((a) >= (b) ? (a) : (b))
+//#define dmin(a,b) (doublereal)min(a,b)
+//#define dmax(a,b) (doublereal)max(a,b)
+//#define bit_test(a,b) ((a) >> (b) & 1)
+//#define bit_clear(a,b) ((a) & ~((uinteger)1 << (b)))
+//#define bit_set(a,b) ((a) | ((uinteger)1 << (b)))
/* procedure parameter types for -A and -C++ */
diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/msio/antennainfo.h b/CEP/DP3/AOFlagger/include/AOFlagger/msio/antennainfo.h
index 1d8efa09b4d..8ba69d3cbc8 100644
--- a/CEP/DP3/AOFlagger/include/AOFlagger/msio/antennainfo.h
+++ b/CEP/DP3/AOFlagger/include/AOFlagger/msio/antennainfo.h
@@ -204,9 +204,9 @@ struct Angle {
{
std::stringstream s;
numl_t deg = valueRad * 180.0/M_PI;
- if(abs(deg) > 3)
+ if(std::abs(deg) > 3)
s << deg << " deg";
- else if(abs(deg) > 3.0/60.0)
+ else if(std::abs(deg) > 3.0/60.0)
s << (deg / 60.0) << " arcmin";
else
s << (deg / 3600.0) << " arcsec";
--
GitLab