merge default branch

1 files changed, 7 insertions, 3 deletions

diff --git a/unsupported/Eigen/MPRealSupport b/unsupported/Eigen/MPRealSupport
index 0584e470e..630e0aa77 100644
--- a/unsupported/Eigen/MPRealSupport
+++ b/unsupported/Eigen/MPRealSupport
@@ -88,9 +88,9 @@ int main()
     inline static Real epsilon  (const Real& x)                                         {    return mpfr::machine_epsilon(x); }
 
     inline static Real dummy_precision()   
-    { 
-        unsigned int weak_prec = ((mpfr::mpreal::get_default_prec()-1) * 90) / 100;
-        return mpfr::machine_epsilon(weak_prec);
+    {
+      mpfr_prec_t weak_prec = ((mpfr::mpreal::get_default_prec()-1) * 90) / 100;
+      return mpfr::machine_epsilon(weak_prec);
     }
   };
 
@@ -159,7 +159,11 @@ int main()
       {
         if(rows==0 || cols==0 || depth==0)
           return;
+<<<<<<< local
 
+=======
+        
+>>>>>>> other
         mpreal  acc1(0,mpfr_get_prec(blockA[0].mpfr_srcptr())),
                 tmp (0,mpfr_get_prec(blockA[0].mpfr_srcptr()));