Mercurial > octave

changeset 28828:e58c51b56d76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Wed, 30 Sep 2020 10:06:55 -0400
parents 473ee93cf1ea (current diff) 7b819cd7ff54 (diff)
children 6804440d2030
files bootstrap.conf
diffstat 2 files changed, 5 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/bootstrap.conf	Wed Sep 30 04:55:19 2020 -0700
+++ b/bootstrap.conf	Wed Sep 30 10:06:55 2020 -0400
@@ -192,7 +192,7 @@
 #
 # To update the ./bootstrap file with that from ./gnulib/build-aux/bootstrap
 
-: ${GNULIB_REVISION=12c89745e39fb7b7dbdba732393dd0251202cadb}
+: ${GNULIB_REVISION=6160ee8e4d2b88d934c3c4c8c5930a75b835723f}
 
 # Don't check for translations since we don't have any in Octave yet.
 # This avoids the need for sha1sum or compatible utility in bootstrap.
--- a/libinterp/octave-value/ov-base-int.cc	Wed Sep 30 04:55:19 2020 -0700
+++ b/libinterp/octave-value/ov-base-int.cc	Wed Sep 30 10:06:55 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;
 }