diff libinterp/corefcn/strfns.cc @ 23450:855122b993da

maint: Wrap tertiary operator in parentheses "(COND ? x : y)". * Canvas.cc, color-picker.cc, dialog.cc, marker.cc, main-window.cc, Cell.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, bsxfun.cc, call-stack.cc, cellfun.cc, data.cc, defaults.cc, det.cc, eig.cc, error.cc, file-io.cc, filter.cc, find.cc, gammainc.cc, gcd.cc, gl-render.cc, graphics.cc, graphics.in.h, help.cc, hex2num.cc, inv.cc, load-save.cc, lookup.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lu.cc, max.cc, mex.cc, oct-hist.cc, oct-map.cc, oct-procbuf.cc, oct-stream.cc, pr-output.cc, rand.cc, regexp.cc, schur.cc, str2double.cc, strfns.cc, symtab.cc, sysdep.cc, tril.cc, variables.cc, xdiv.cc, audiodevinfo.cc, audioread.cc, colamd.cc, gzip.cc, ov-base-diag.cc, ov-base-mat.h, ov-base-scalar.h, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-range.cc, ov-range.h, ov-struct.cc, ov-usr-fcn.cc, ov.cc, octave.cc, op-class.cc, pt-eval.cc, pt-funcall.cc, pt-idx.cc, pt-jit.cc, pt-stmt.cc, version.cc, Array-util.cc, Array.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CSparse.cc, Range.cc, Sparse.cc, chNDArray.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dSparse.cc, dim-vector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, idx-vector.cc, idx-vector.h, Faddeeva.cc, DASPK.cc, DASRT.cc, DASSL.cc, EIG.cc, fEIG.cc, gsvd.cc, lo-specfun.cc, oct-rand.cc, qr.cc, qrp.cc, randgamma.cc, schur.cc, svd.cc, Sparse-diag-op-defs.h, mx-inlines.cc, oct-env.cc, cmd-edit.cc, kpse.cc, oct-inttypes.h, oct-sort.cc: Wrap tertiary operator in parentheses "(COND ? x : y)".
author Rik <rik@octave.org>
date Thu, 27 Apr 2017 17:33:10 -0700
parents 945b53af4655
children 21baad6b35c4
line wrap: on
line diff
--- a/libinterp/corefcn/strfns.cc	Thu Apr 27 15:18:20 2017 -0700
+++ b/libinterp/corefcn/strfns.cc	Thu Apr 27 17:33:10 2017 -0700
@@ -355,7 +355,7 @@
 
           boolNDArray output (cell_val.dims (), false);
 
-          std::string s = r == 0 ? "" : str[0];
+          std::string s = (r == 0 ? "" : str[0]);
 
           if (cell_val.is_cellstr ())
             {
@@ -750,7 +750,7 @@
 
   std::string tmp = args(1).xstring_value ("CODEPAGE must be a string");
   const char *codepage
-    = tmp.empty () ? octave_locale_charset_wrapper () : tmp.c_str ();
+    = (tmp.empty () ? octave_locale_charset_wrapper () : tmp.c_str ());
 
   charNDArray native_bytes = args(0).char_array_value ();
 
@@ -796,7 +796,7 @@
 
   std::string tmp = args(1).xstring_value ("CODEPAGE must be a string");
   const char *codepage
-    = tmp.empty () ? octave_locale_charset_wrapper () : tmp.c_str ();
+    = (tmp.empty () ? octave_locale_charset_wrapper () : tmp.c_str ());
 
   charNDArray utf8_str = args(0).xchar_array_value ("UTF8_STR must be a string");