Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

Diff of /src/mpv.cpp [7258ed] .. [214b68] Maximize Restore

  Switch to side-by-side view

--- a/src/mpv.cpp
+++ b/src/mpv.cpp
@@ -71067,11 +71067,18 @@
 
   octave_mp (void);
   octave_mp (signed long si, mpfr_prec_t sprec = mpfr_get_default_prec (), mpfr_rnd_t srnd = mpfr_get_default_rounding_mode ());
-
   octave_mp (unsigned long ui, mpfr_prec_t sprec = mpfr_get_default_prec (), mpfr_rnd_t srnd = mpfr_get_default_rounding_mode ());
+
   octave_mp (const octave_mp& s);
+
+  octave_mp (const std::string& x, mpfr_prec_t sprec = mpfr_get_default_prec (), mpfr_rnd_t srnd = mpfr_get_default_rounding_mode ());
+
+  octave_mp (const float& x, mpfr_prec_t sprec = mpfr_get_default_prec (), mpfr_rnd_t srnd = mpfr_get_default_rounding_mode ());
   octave_mp (const double& x, mpfr_prec_t sprec = mpfr_get_default_prec (), mpfr_rnd_t srnd = mpfr_get_default_rounding_mode ());
-   octave_mp (const std::string& x, mpfr_prec_t sprec = mpfr_get_default_prec (), mpfr_rnd_t srnd = mpfr_get_default_rounding_mode ());
+
+  octave_mp (const octave_value& x, mpfr_prec_t sprec = mpfr_get_default_prec (), mpfr_rnd_t srnd = mpfr_get_default_rounding_mode ());
+
+  octave_mp (const octave_base_value& x, mpfr_prec_t sprec = mpfr_get_default_prec (), mpfr_rnd_t srnd = mpfr_get_default_rounding_mode ());
 
   ~octave_mp (void) { mpfr_clear (scalar); }
 
@@ -71101,17 +71108,18 @@
   bool is_mp_type (void) const { return true; }
 
 
-  int mp_eq_proxy(const octave_mp& s) const
-  {
-    return mpfr_equal_p (scalar, s.scalar);
-  }
-
-  int mp_neq_proxy(const octave_mp& s) const
-  {
-    return !mpfr_equal_p (scalar, s.scalar);
-  }
-
-  octave_value oct_binop_proxy (const octave_base_value& a1, const octave_base_value& a2,
+  octave_value oct_monocmp_proxy (const octave_mp& a1,
+                                  int (*func) (mpfr_srcptr op1));
+
+  octave_value oct_monop_proxy (const octave_mp& a1,
+                                int (*func) (mpfr_ptr rop, mpfr_srcptr op1, mpfr_rnd_t rnd));
+
+  octave_value oct_bincmp_proxy (const octave_base_value& a1,
+                                 const octave_base_value& a2,
+                                 int (*func) (mpfr_srcptr op1, mpfr_srcptr op2));
+
+  octave_value oct_binop_proxy (const octave_base_value& a1,
+                                const octave_base_value& a2,
                                 int (*func) (mpfr_ptr rop, mpfr_srcptr op1, mpfr_srcptr op2, mpfr_rnd_t rnd));
 
   bool valid_as_scalar_index (void) const
@@ -71131,6 +71139,8 @@
 
   double double_value (bool = false) const { return mpfr_get_d (scalar, rnd); }
 
+  double mp_value (bool = false) const { return 42; }
+
   octave_value hermitian (void) const { return new octave_mp (*this); }
 
   void increment (void) { mpfr_add_ui(scalar, scalar, 1, rnd); }
@@ -71144,7 +71154,7 @@
 private:
 
   mpfr_t scalar;
-  mpfr_prec_t prec;
+  static mpfr_prec_t prec;
   mpfr_rnd_t rnd;