From ef79a6cd0ea07305ccf4d67860c1d2fead8e9bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Wed, 14 Mar 2012 16:35:20 +0100
Subject: [PATCH] Fix string warnings for Octave 3.6 (cherry picked from commit
 e62613e6cbdc555fa78b8d9090a5ee3029e458fe)

---
 matlab/warning_config.m | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/matlab/warning_config.m b/matlab/warning_config.m
index 849645280..b3b04f948 100644
--- a/matlab/warning_config.m
+++ b/matlab/warning_config.m
@@ -10,7 +10,7 @@ function warning_config()
 % SPECIAL REQUIREMENTS
 %   none
 
-% Copyright (C) 2008-2010 Dynare Team
+% Copyright (C) 2008-2012 Dynare Team
 %
 % This file is part of Dynare.
 %
@@ -41,7 +41,11 @@ if exist('OCTAVE_VERSION')
     warning('off', 'Octave:num-to-str');
     warning('off', 'Octave:resize-on-range-error');
     warning('off', 'Octave:str-to-num');
-    warning('off', 'Octave:string-concat');
+    if octave_ver_less_than('3.6')
+        warning('off', 'Octave:string-concat');
+    else
+        warning('off', 'Octave:mixed-string-concat');
+    end
     warning('off', 'Octave:variable-switch-label');
     warning('off', 'Octave:fortran-indexing');
 else
-- 
GitLab