changeset 28826:0b5b223f6d93 stable

avoid warnings from template specializations that won't be used * ov-base-int.cc (octave_base_int_scalar<T>::load_binary): Don't switch on result of byte_size(). Only one byte_size<T> template specialization is needed, so use byte_size<sizeof (T)> instead.
author John W. Eaton <jwe@octave.org>
date Tue, 29 Sep 2020 17:21:34 -0400
parents 7ceb7485ceb2
children 7b819cd7ff54
files libinterp/octave-value/ov-base-int.cc
diffstat 1 files changed, 4 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/octave-value/ov-base-int.cc	Sat Sep 26 10:48:07 2020 +0200
+++ b/libinterp/octave-value/ov-base-int.cc	Tue Sep 29 17:21:34 2020 -0400
@@ -706,26 +706,15 @@
                                         octave::mach_info::float_format)
 {
   T tmp;
+
   if (! is.read (reinterpret_cast<char *> (&tmp), this->byte_size ()))
     return false;
 
   if (swap)
-    switch (this->byte_size ())
-      {
-      case 8:
-        swap_bytes<8> (&tmp);
-        break;
-      case 4:
-        swap_bytes<4> (&tmp);
-        break;
-      case 2:
-        swap_bytes<2> (&tmp);
-        break;
-      case 1:
-      default:
-        break;
-      }
+    swap_bytes<sizeof (T)> (&tmp);
+
   this->scalar = tmp;
+
   return true;
 }