From 7380592bc23aa9d331b99bac22bbb5fb4c854639 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Thu, 21 Jun 2012 09:59:44 +0200
Subject: [PATCH] patch mpfr c++ copy to fix warnings and min/max issues

---
 unsupported/test/mpreal/dlmalloc.c | 2 +-
 unsupported/test/mpreal/mpreal.cpp | 3 ++-
 unsupported/test/mpreal/mpreal.h   | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/unsupported/test/mpreal/dlmalloc.c b/unsupported/test/mpreal/dlmalloc.c
index a2c03b533..7ce8feb07 100755
--- a/unsupported/test/mpreal/dlmalloc.c
+++ b/unsupported/test/mpreal/dlmalloc.c
@@ -1267,7 +1267,7 @@ int mspace_mallopt(int, int);
 #endif /* MSPACES */
 
 #ifdef __cplusplus
-};  /* end of extern "C" */
+}  /* end of extern "C" */
 #endif /* __cplusplus */
 
 /*
diff --git a/unsupported/test/mpreal/mpreal.cpp b/unsupported/test/mpreal/mpreal.cpp
index 2b1ece787..5c23544ef 100644
--- a/unsupported/test/mpreal/mpreal.cpp
+++ b/unsupported/test/mpreal/mpreal.cpp
@@ -432,7 +432,8 @@ std::string mpreal::toString(const std::string& format) const
 
 std::string mpreal::toString(int n, int b, mp_rnd_t mode) const
 {
-
+  (void)b;
+  (void)mode;
 #if (MPFR_VERSION >= MPFR_VERSION_NUM(2,4,0))
 
 	// Use MPFR native function for output
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)