From b52d2efda2feb66a8d4128cb1413df69e9654623 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 25 Aug 2025 08:36:58 -0600 Subject: [PATCH] Disambiguate the type name "complex" --- src/cxsc.C | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cxsc.C b/src/cxsc.C index 488865b..382510a 100644 --- a/src/cxsc.C +++ b/src/cxsc.C @@ -614,7 +614,7 @@ static Obj CI_CXSC_STRING (Obj self, Obj str) if (s[0] == '[') s >> CI_OBJ(f); else if (s[0] == '(') { - complex l, r; + cxsc::complex l, r; std::string t = CSTR_STRING(str); s >> RndDown >> l; t >> RndUp >> r; @@ -626,9 +626,9 @@ static Obj CI_CXSC_STRING (Obj self, Obj str) s >> RndDown >> l; t >> RndUp >> r; if (last == 'i' || last == 'I') - CI_OBJ(f) = cinterval(complex(0.0,l),complex(0.0,r)); + CI_OBJ(f) = cinterval(cxsc::complex(0.0,l),cxsc::complex(0.0,r)); else - CI_OBJ(f) = cinterval(complex(l),complex(r)); + CI_OBJ(f) = cinterval(cxsc::complex(l),cxsc::complex(r)); } return f; @@ -994,9 +994,9 @@ static inline real ldexp (real f, int s) real g = f; times2pown(g, s); return g; } -static inline complex ldexp (complex f, int s) +static inline cxsc::complex ldexp (cxsc::complex f, int s) { - return complex(ldexp(Re(f),s),ldexp(Im(f),s)); + return cxsc::complex(ldexp(Re(f),s),ldexp(Im(f),s)); } static inline interval ldexp (interval f, int s) {