From 578e1e2a27fba59f480d82d94d989b19470a36ff Mon Sep 17 00:00:00 2001
From: Tammo Jan Dijkema <dijkema@astron.nl>
Date: Thu, 5 Nov 2015 09:28:49 +0000
Subject: [PATCH] Task #8422: add suggestions by Alexander
---
CEP/Calibration/ExpIon/src/baselinefitting.cc | 5 ++++-
CEP/PyBDSM/src/c++/MGFunction2.cc | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CEP/Calibration/ExpIon/src/baselinefitting.cc b/CEP/Calibration/ExpIon/src/baselinefitting.cc
index c81e7dc1934..7d7b4828352 100644
--- a/CEP/Calibration/ExpIon/src/baselinefitting.cc
+++ b/CEP/Calibration/ExpIon/src/baselinefitting.cc
@@ -149,7 +149,10 @@ ValueHolder fit(const ValueHolder &phases_vh, const ValueHolder &A_vh, const Val
phase_ij_model += (sol[i + l*N_station] - sol[j + l*N_station]) * coeff ;
}
Float sin_dphase, cos_dphase;
- __sincosf(phase_ij_obs - phase_ij_model, &sin_dphase, &cos_dphase);
+#if defined(_LIBCPP_VERSION)
+#define sincosf __sincosf
+#endif
+ sincosf(phase_ij_obs - phase_ij_model, &sin_dphase, &cos_dphase);
Float residual_re = cos_dphase - 1.0;
Float residual_im = sin_dphase;
Float derivative_re = -sin_dphase;
diff --git a/CEP/PyBDSM/src/c++/MGFunction2.cc b/CEP/PyBDSM/src/c++/MGFunction2.cc
index e4a8a227178..90e8a5e72b5 100644
--- a/CEP/PyBDSM/src/c++/MGFunction2.cc
+++ b/CEP/PyBDSM/src/c++/MGFunction2.cc
@@ -35,7 +35,7 @@ and parameters under exponents (NL_ij) are non-linear.
#include "boost_python.h"
#include "MGFunction.h"
-#if not(defined(_LIBCPP_VERSION))
+#if defined(GLIBCXX)
#include <ext/algorithm>
#endif
#include <num_util/num_util.h>
--
GitLab