diff options
author | Gael Guennebaud <g.gael@free.fr> | 2012-06-21 09:59:44 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2012-06-21 09:59:44 +0200 |
commit | 7380592bc23aa9d331b99bac22bbb5fb4c854639 (patch) | |
tree | 4318e6872495e0e6f15def6a9dbff40bfe2f4110 /unsupported/test/mpreal/mpreal.h | |
parent | b5093e25855ee66c3879e5d60f36d37e80717fd5 (diff) |
patch mpfr c++ copy to fix warnings and min/max issues
Diffstat (limited to 'unsupported/test/mpreal/mpreal.h')
-rw-r--r-- | unsupported/test/mpreal/mpreal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unsupported/test/mpreal/mpreal.h b/unsupported/test/mpreal/mpreal.h index 1fac3fbc9..c640af947 100644 --- a/unsupported/test/mpreal/mpreal.h +++ b/unsupported/test/mpreal/mpreal.h @@ -538,7 +538,7 @@ private: //
// at the beginning of
// [Visual Studio Installation Folder]\Common7\Packages\Debugger\autoexp.dat
- MPREAL_MSVC_DEBUGVIEW_DATA;
+ MPREAL_MSVC_DEBUGVIEW_DATA
};
//////////////////////////////////////////////////////////////////////////
@@ -689,8 +689,8 @@ inline int bits2digits(mp_prec_t b); //////////////////////////////////////////////////////////////////////////
// min, max
-const mpreal max(const mpreal& x, const mpreal& y);
-const mpreal min(const mpreal& x, const mpreal& y);
+const mpreal (max)(const mpreal& x, const mpreal& y);
+const mpreal (min)(const mpreal& x, const mpreal& y);
//////////////////////////////////////////////////////////////////////////
// Implementation
@@ -1557,7 +1557,7 @@ inline bool isEqualUlps(const mpreal& a, const mpreal& b, int maxUlps) /*
maxUlps - a and b can be apart by maxUlps binary numbers.
*/
- return abs(a - b) <= machine_epsilon(max(abs(a), abs(b))) * maxUlps;
+ return abs(a - b) <= machine_epsilon((max)(abs(a), abs(b))) * maxUlps;
}
inline bool isEqualFuzzy(const mpreal& a, const mpreal& b, const mpreal& eps)
|