Mercurial > octave

diff libinterp/octave-value/ov.h @ 30835:2989202f92f8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
only allow range<FLOAT> to be instantiated * Range.h, Range.cc: Limit range<T> to floating point values. * range-fwd.h: Update forward declaration of range<T>. * ov-base.h, ov-base.cc, ov-range.h, ov-range.cc, ov.h, ov.cc, pt-eval.cc: Temporarily comment out code that uses range<INT> objects.
author John W. Eaton <jwe@octave.org>
date Thu, 17 Mar 2022 02:44:19 -0400
parents 796f54d4ddbf
children 97504d2edcc7 95725e6ad9c1
line wrap: on
line diff
--- a/libinterp/octave-value/ov.h	Sun Mar 13 12:57:22 2022 -0400
+++ b/libinterp/octave-value/ov.h	Thu Mar 17 02:44:19 2022 -0400
@@ -316,28 +316,44 @@
   }
 #endif
 
-  OCTINTERP_API octave_value (const octave::range<char>& r, char type,
+  OCTINTERP_API octave_value (const octave::range<double>& r,
                               bool force_range = false);
+
+  // For now, disable all but range<double>.
+
+#if 0
+
   OCTINTERP_API octave_value (const octave::range<float>& r,
                               bool force_range = false);
-  OCTINTERP_API octave_value (const octave::range<double>& r,
-                              bool force_range = false);
+
   OCTINTERP_API octave_value (const octave::range<octave_int8>& r,
                               bool force_range = false);
+
   OCTINTERP_API octave_value (const octave::range<octave_int16>& r,
                               bool force_range = false);
+
   OCTINTERP_API octave_value (const octave::range<octave_int32>& r,
                               bool force_range = false);
+
   OCTINTERP_API octave_value (const octave::range<octave_int64>& r,
                               bool force_range = false);
+
   OCTINTERP_API octave_value (const octave::range<octave_uint8>& r,
                               bool force_range = false);
+
   OCTINTERP_API octave_value (const octave::range<octave_uint16>& r,
                               bool force_range = false);
+
   OCTINTERP_API octave_value (const octave::range<octave_uint32>& r,
                               bool force_range = false);
+
   OCTINTERP_API octave_value (const octave::range<octave_uint64>& r,
                               bool force_range = false);
+
+  OCTINTERP_API octave_value (const octave::range<char>& r, char type,
+                              bool force_range = false);
+#endif
+
   OCTINTERP_API octave_value (const octave_map& m);
   OCTINTERP_API octave_value (const octave_scalar_map& m);
   OCTINTERP_API octave_value (const std::map<std::string, octave_value>&);
@@ -1008,12 +1024,16 @@
   Array<std::string> cellstr_value (void) const
   { return m_rep->cellstr_value (); }
 
+  octave::range<double> range_value (void) const
+  { return m_rep->range_value (); }
+
+  // For now, disable all but range<double>.
+
+#if 0
+
   octave::range<float> float_range_value (void) const
   { return m_rep->float_range_value (); }
 
-  octave::range<double> range_value (void) const
-  { return m_rep->range_value (); }
-
   octave::range<octave_int8> int8_range_value (void) const
   { return m_rep->int8_range_value (); }
 
@@ -1038,6 +1058,8 @@
   octave::range<octave_uint64> uint64_range_value (void) const
   { return m_rep->uint64_range_value (); }
 
+#endif
+
   OCTINTERP_API octave_map map_value (void) const;
 
   OCTINTERP_API octave_scalar_map scalar_map_value (void) const;
@@ -1269,12 +1291,16 @@
 
   OCTINTERP_API Array<std::string> xcellstr_value (const char *fmt, ...) const;
 
+  OCTINTERP_API octave::range<double>
+  xrange_value (const char *fmt, ...) const;
+
+  // For now, disable all but range<double>.
+
+#if 0
+
   OCTINTERP_API octave::range<float>
   xfloat_range_value (const char *fmt, ...) const;
 
-  OCTINTERP_API octave::range<double>
-  xrange_value (const char *fmt, ...) const;
-
   OCTINTERP_API octave::range<octave_int8>
   xint8_range_value (const char *fmt, ...) const;
 
@@ -1299,6 +1325,8 @@
   OCTINTERP_API octave::range<octave_uint64>
   xuint64_range_value (const char *fmt, ...) const;
 
+#endif
+
   OCTINTERP_API octave_map xmap_value (const char *fmt, ...) const;
 
   OCTINTERP_API octave_scalar_map