Mercurial > octave

changeset 21663:79414f8e6f24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
schur.cc: Declare selector variable as volatile to suppress gcc warning. schur.cc (init): Declare selector variable as volatile to suppress gcc warning.
author Rik <rik@octave.org>
date Mon, 02 May 2016 14:27:52 -0700
parents 5b9868c2e212
children 22e7b6ad93b6
files liboctave/numeric/schur.cc
diffstat 1 files changed, 4 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/numeric/schur.cc	Mon May 02 11:13:50 2016 -0700
+++ b/liboctave/numeric/schur.cc	Mon May 02 14:27:52 2016 -0700
@@ -173,13 +173,11 @@
   if (ord_char == 'A' || ord_char == 'D' || ord_char == 'a' || ord_char == 'd')
     sort = 'S';
 
-  double_selector selector = 0;
+  volatile double_selector selector = 0;
   if (ord_char == 'A' || ord_char == 'a')
     selector = select_ana<double>;
   else if (ord_char == 'D' || ord_char == 'd')
     selector = select_dig<double>;
-  else
-    selector = 0;
 
   octave_idx_type n = a_nc;
   octave_idx_type lwork = 8 * n;
@@ -262,13 +260,11 @@
   if (ord_char == 'A' || ord_char == 'D' || ord_char == 'a' || ord_char == 'd')
     sort = 'S';
 
-  float_selector selector = 0;
+  volatile float_selector selector = 0;
   if (ord_char == 'A' || ord_char == 'a')
     selector = select_ana<float>;
   else if (ord_char == 'D' || ord_char == 'd')
     selector = select_dig<float>;
-  else
-    selector = 0;
 
   octave_idx_type n = a_nc;
   octave_idx_type lwork = 8 * n;
@@ -351,13 +347,11 @@
   if (ord_char == 'A' || ord_char == 'D' || ord_char == 'a' || ord_char == 'd')
     sort = 'S';
 
-  complex_selector selector = 0;
+  volatile complex_selector selector = 0;
   if (ord_char == 'A' || ord_char == 'a')
     selector = select_ana<Complex>;
   else if (ord_char == 'D' || ord_char == 'd')
     selector = select_dig<Complex>;
-  else
-    selector = 0;
 
   octave_idx_type n = a_nc;
   octave_idx_type lwork = 8 * n;
@@ -460,13 +454,11 @@
   if (ord_char == 'A' || ord_char == 'D' || ord_char == 'a' || ord_char == 'd')
     sort = 'S';
 
-  float_complex_selector selector = 0;
+  volatile float_complex_selector selector = 0;
   if (ord_char == 'A' || ord_char == 'a')
     selector = select_ana<FloatComplex>;
   else if (ord_char == 'D' || ord_char == 'd')
     selector = select_dig<FloatComplex>;
-  else
-    selector = 0;
 
   octave_idx_type n = a_nc;
   octave_idx_type lwork = 8 * n;