From 79e67d31857ee344b5d4c3906fe66dbce4fded6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@debian.org>
Date: Thu, 4 Dec 2014 13:55:41 +0100
Subject: [PATCH] Under Octave, don't overload the built-in rows and columns
functions.
Since those functions are built-in, exist('...', 'file') returns false.
(cherry picked from commit d31e6a66def0a5f33fa8e45af647b8e40b023a1d)
---
src/initialize_dates_toolbox.m | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/initialize_dates_toolbox.m b/src/initialize_dates_toolbox.m
index f298fbb..c992897 100644
--- a/src/initialize_dates_toolbox.m
+++ b/src/initialize_dates_toolbox.m
@@ -14,14 +14,14 @@ if ~exist('isint','file')
addpath([dates_src_root '/utilities/missing/isint'])
end
-if ~exist('rows','file') || ~exist('columns','file')
- addpath([dates_src_root '/utilities/missing/dims'])
-end
-
if ~exist('isoctave','file')
addpath([dates_src_root '/utilities/missing/isoctave'])
end
+if ~isoctave && (~exist('rows','file') || ~exist('columns','file'))
+ addpath([dates_src_root '/utilities/missing/dims'])
+end
+
if ~exist('shiftS','file')
addpath([dates_src_root '/utilities/missing/shiftS'])
end
--
GitLab