Mercurial > octave

changeset 25697:91f0416c2ba7

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 Fri, 27 Jul 2018 18:15:17 -0400
parents 3b6691ff0f59 (current diff) cfc32b131755 (diff)
children ac386820f2b6
files libinterp/corefcn/load-save.cc
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/load-save.cc	Wed Jun 27 08:36:55 2018 +0200
+++ b/libinterp/corefcn/load-save.cc	Fri Jul 27 18:15:17 2018 -0400
@@ -1199,7 +1199,6 @@
     case LS_MAT7_BINARY:
       {
         char const *versionmagic;
-        int16_t number = *(reinterpret_cast<const int16_t *>("\x00\x01"));
         char headertext[128];
         octave::sys::gmtime now;
 
@@ -1219,7 +1218,7 @@
         // pair indicates whether the file was written by a big- or
         // little-endian machine.  However, the version number is
         // written in the *opposite* byte order from everything else!
-        if (number == 1)
+        if (octave::mach_info::words_big_endian ())
           versionmagic = "\x01\x00\x4d\x49"; // this machine is big endian
         else
           versionmagic = "\x00\x01\x49\x4d"; // this machine is little endian
--- a/scripts/set/setdiff.m	Wed Jun 27 08:36:55 2018 +0200
+++ b/scripts/set/setdiff.m	Fri Jul 27 18:15:17 2018 -0400
@@ -24,7 +24,7 @@
 ## Return the unique elements in @var{a} that are not in @var{b} sorted in
 ## ascending order.
 ##
-## If @var{a} is a row vector return a column vector; Otherwise, return a
+## If @var{a} is a row vector return a row vector; Otherwise, return a
 ## column vector.  The inputs may also be cell arrays of strings.
 ##
 ## If the optional input @qcode{"rows"} is given then return the rows in