Mercurial > octave

diff libinterp/octave-value/ov-str-mat.cc @ 21120:499b851fbfae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace pattern if/err_XXX/else/code with if/err_XXX/ code. * schur.cc, ov-complex.h, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.h, ov-flt-complex.h, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.h, ov-str-mat.cc, ops.h, pt-idx.cc, Array.cc, CColVector.cc, CMatrix.cc, CRowVector.cc, MSparse.cc, PermMatrix.cc, Sparse.cc, dColVector.cc, dMatrix.cc, dRowVector.cc, dSparse.cc, fCColVector.cc, fCMatrix.cc, fCRowVector.cc, fColVector.cc, fMatrix.cc, fRowVector.cc: Replace pattern if/err_XXX/else/code with if/err_XXX/ code.
author Rik <rik@octave.org>
date Wed, 20 Jan 2016 16:58:59 -0800
parents dfcb9d74b253
children 95f8c8cdbffe
line wrap: on
line diff
--- a/libinterp/octave-value/ov-str-mat.cc	Wed Jan 20 16:10:23 2016 -0800
+++ b/libinterp/octave-value/ov-str-mat.cc	Wed Jan 20 16:58:59 2016 -0800
@@ -165,14 +165,12 @@
  \
   if (! force_string_conv) \
     err_invalid_conversion ("string", TNAME); \
-  else \
-    { \
-      warning_with_id ("Octave:str-to-num", \
-                       "implicit conversion from %s to %s", \
-                       "string", TNAME); \
  \
-      retval = octave_char_matrix::FCN (); \
-    } \
+  warning_with_id ("Octave:str-to-num", \
+                   "implicit conversion from %s to %s", \
+                   "string", TNAME); \
+ \
+  retval = octave_char_matrix::FCN (); \
  \
   return retval