Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.3
qucs
qucs-tr1.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File qucs-tr1.diff of Package qucs
diff --git a/qucs-core/src/math/complex.cpp b/qucs-core/src/math/complex.cpp index 3869fbf..6e29441 100644 --- a/qucs-core/src/math/complex.cpp +++ b/qucs-core/src/math/complex.cpp @@ -366,7 +366,7 @@ nr_complex_t atan (const nr_complex_t z) { \return arc tangent of z */ nr_complex_t atan2 (const nr_complex_t y, const nr_complex_t x) { - nr_complex_t a = atan (y / x); + nr_complex_t a = std::tr1::atan (y / x); return real (x) > 0.0 ? a : -a; } #endif diff --git a/qucs-core/src/math/complex.h b/qucs-core/src/math/complex.h index 7f015fa..ee8bcd1 100644 --- a/qucs-core/src/math/complex.h +++ b/qucs-core/src/math/complex.h @@ -32,7 +32,7 @@ #elif defined HAVE_TR1_COMPLEX #include <tr1/complex> using namespace std; -using namespace std::tr1; +//using namespace std::tr1; typedef std::complex<nr_double_t> nr_complex_t; #else #include <complex> @@ -52,26 +52,38 @@ nr_complex_t rect (const nr_double_t x, const nr_double_t y = 0.0); // overloaded math functions #ifndef HAVE_CXX_COMPLEX_ACOS nr_complex_t acos (const nr_complex_t); +#else +using std::tr1::acos; #endif #ifndef HAVE_CXX_COMPLEX_ACOSH nr_complex_t acosh (const nr_complex_t); +#else +using std::tr1::acosh; #endif #ifndef HAVE_CXX_COMPLEX_ASIN nr_complex_t asin (const nr_complex_t); +#else +using std::tr1::asin; #endif #ifndef HAVE_CXX_COMPLEX_ASINH nr_complex_t asinh (const nr_complex_t); +#else +using std::tr1::asinh; #endif #ifndef HAVE_CXX_COMPLEX_ATAN nr_complex_t atan (const nr_complex_t); +#else +using std::tr1::atan; #endif #ifndef HAVE_CXX_COMPLEX_ATANH nr_complex_t atanh (const nr_complex_t); +#else +using std::tr1::atanh; #endif #ifndef HAVE_CXX_COMPLEX_ATAN2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor