Mercurial > octave

changeset 22461:cc4f31e8477f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Accept, but ignore, mex argument -largeArrayDims, -compatibleArrayDims (bug #39984). * mex.m: Use printf, rather than disp, to avoid an extra newline on output. * mkoctfile.in.cc: Add elseif clause to detect -largeArrayDims, -compatibleArrayDims and issue a warning.
author Rik <rik@octave.org>
date Sat, 10 Sep 2016 06:20:03 -0700
parents b0caa61934fe
children 6cb7813e5b2f
files scripts/miscellaneous/mex.m src/mkoctfile.in.cc
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/miscellaneous/mex.m	Fri Sep 09 20:00:17 2016 -0700
+++ b/scripts/miscellaneous/mex.m	Sat Sep 10 06:20:03 2016 -0700
@@ -29,7 +29,7 @@
   [output, status] = mkoctfile ("--mex", varargin{:});
 
   if (! isempty (output))
-    disp (output);
+    printf ("%s", output);
   endif
   if (nargout > 0)
     retval = status;
--- a/src/mkoctfile.in.cc	Fri Sep 09 20:00:17 2016 -0700
+++ b/src/mkoctfile.in.cc	Sat Sep 10 06:20:03 2016 -0700
@@ -498,6 +498,10 @@
         {
           defs += (" " + arg);
         }
+      else if (arg == "-largeArrayDims" || arg == "-compatibleArrayDims")
+        {
+          std::cout << "warning: -largeArrayDims and -compatibleArrayDims are accepted for compatibility, but ignored" << std::endl;
+        }
       else if (starts_with (arg, "-Wl,") || starts_with (arg, "-l")
                || starts_with (arg, "-L") || starts_with (arg, "-R"))
         {