diff --git a/triqs/arrays/mapped_functions.hpp b/triqs/arrays/mapped_functions.hpp index 51206c17..d0a4eecd 100644 --- a/triqs/arrays/mapped_functions.hpp +++ b/triqs/arrays/mapped_functions.hpp @@ -24,11 +24,14 @@ #include namespace triqs { namespace arrays { + // not for libc++ (already defined) +#if !defined(_LIBCPP_VERSION) // complex conjugation for integers inline int conj(int x) { return x; } inline long conj(long x) { return x; } inline long long conj(long long x) { return x; } - inline double conj(double x) { return x; } + inline std::complex conj(double x) { return x; } +#endif //C++14 will simply be ... //template decltype(auto) abs(A && a) { return map( [](auto const &x) { using std::abs; return abs(a);}, std::forward(a));}