Mercurial > octave
changeset 21017:93748bcaec17
maint: Replace emtpy 'std::string ()' calls with "".
* Backend.cc, comment-list.h, debug.cc, defaults.in.h, dynamic-ld.h, error.cc,
graphics.cc, graphics.in.h, help.cc, hook-fcn.h, load-path.cc, load-path.h,
ls-ascii-helper.cc, ls-mat-ascii.cc, ls-mat5.cc, ls-mat5.h, ls-oct-text.cc,
oct-iostrm.h, oct-lvalue.h, oct-stream.cc, oct-stream.h, oct-strstrm.h,
regexp.cc, schur.cc, sqrtm.cc, strfns.cc, symtab.cc, symtab.h, sysdep.cc,
toplev.cc, urlwrite.cc, variables.cc, variables.h, ov-builtin.h, ov-cell.cc,
ov-class.cc, ov-classdef.cc, ov-classdef.h, ov-dld-fcn.h, ov-fcn-handle.cc,
ov-fcn-inline.cc, ov-fcn-inline.h, ov-fcn.h, ov-lazy-idx.cc, ov-mex-fcn.h,
ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.h,
ovl.h, octave.cc, lex.h, parse.h, pt-classdef.h, pt-exp.cc, pt-pr-code.h,
token.h, version.cc, version.in.h, oct-rand.h, dir-ops.h, file-ops.cc,
file-ops.h, file-stat.h, oct-env.cc, oct-group.cc, oct-passwd.cc,
oct-syscalls.cc, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, kpse.cc,
lo-array-gripes.h, pathsearch.cc, pathsearch.h, str-vec.h, url-transfer.h:
Replace emtpy 'std::string ()' calls with "".
line wrap: on
line diff
--- a/libgui/graphics/Backend.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libgui/graphics/Backend.cc Wed Dec 30 12:33:33 2015 -0800 @@ -65,7 +65,7 @@ qCritical ("QtHandles::Backend: no __object__ property known for object " "of type %s", go.type ().c_str ()); - return std::string (); + return ""; } Backend::Backend (void)
--- a/libinterp/corefcn/comment-list.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/comment-list.h Wed Dec 30 12:33:33 2015 -0800 @@ -48,7 +48,7 @@ copyright }; - octave_comment_elt (const std::string& s = std::string (), + octave_comment_elt (const std::string& s = "", comment_type t = unknown) : txt (s), typ (t) { }
--- a/libinterp/corefcn/debug.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/debug.cc Wed Dec 30 12:33:33 2015 -0800 @@ -167,7 +167,7 @@ // current call stack. static octave_user_code * -get_user_code (const std::string& fname = std::string ()) +get_user_code (const std::string& fname = "") { octave_user_code *dbg_fcn = 0; @@ -197,7 +197,7 @@ { int idx = 0; int list_idx = 0; - symbol_name = std::string (); + symbol_name = ""; lines = bp_table::intmap (); if (args.length () == 0)
--- a/libinterp/corefcn/defaults.in.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/defaults.in.h Wed Dec 30 12:33:33 2015 -0800 @@ -231,9 +231,9 @@ extern OCTINTERP_API void install_defaults (void); extern OCTINTERP_API void -set_exec_path (const std::string& path = std::string ()); +set_exec_path (const std::string& path = ""); extern OCTINTERP_API void -set_image_path (const std::string& path = std::string ()); +set_image_path (const std::string& path = ""); #endif
--- a/libinterp/corefcn/dynamic-ld.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/dynamic-ld.h Wed Dec 30 12:33:33 2015 -0800 @@ -42,12 +42,12 @@ static octave_function * load_oct (const std::string& fcn_name, - const std::string& file_name = std::string (), + const std::string& file_name = "", bool relative = false); static octave_function * load_mex (const std::string& fcn_name, - const std::string& file_name = std::string (), + const std::string& file_name = "", bool relative = false); static bool remove_oct (const std::string& fcn_name, octave_shlib& shl); @@ -70,12 +70,12 @@ octave_function * do_load_oct (const std::string& fcn_name, - const std::string& file_name = std::string (), + const std::string& file_name = "", bool relative = false); octave_function * do_load_mex (const std::string& fcn_name, - const std::string& file_name = std::string (), + const std::string& file_name = "", bool relative = false); bool do_remove_oct (const std::string& fcn_name, octave_shlib& shl);
--- a/libinterp/corefcn/error.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/error.cc Wed Dec 30 12:33:33 2015 -0800 @@ -1040,7 +1040,7 @@ std::string& id) { nargs = args; - id = std::string (); + id = ""; int nargin = args.length (); @@ -1859,8 +1859,8 @@ if (args(0).string_value () != "reset") error ("lasterror: unrecognized string argument"); - Vlast_error_message = std::string (); - Vlast_error_id = std::string (); + Vlast_error_message = ""; + Vlast_error_id = ""; Vlast_error_stack = initialize_last_error_stack (); }
--- a/libinterp/corefcn/graphics.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/graphics.cc Wed Dec 30 12:33:33 2015 -0800 @@ -6926,7 +6926,7 @@ exponent = gnulib::floor (std::log10 (values(i))); significand = values(i) * std::pow (10., -exponent); - os.str (std::string ()); + os.str (""); if ((std::abs (significand) - 1) > std::numeric_limits<double>::epsilon()) os << significand << "."; @@ -6950,7 +6950,7 @@ { for (int i = 0; i < values.numel (); i++) { - os.str (std::string ()); + os.str (""); os << values(i); c(i) = os.str (); } @@ -8094,7 +8094,7 @@ Matrix zd = get_zdata ().matrix_value (); NDArray cd = get_cdata ().array_value (); - bad_data_msg = std::string (); + bad_data_msg = ""; if (xd.dims () != yd.dims () || (xd.dims () != zd.dims () && ! zd.is_empty ())) { @@ -8181,7 +8181,7 @@ octave_idx_type nvert = vert.rows (); // Check all vertices in faces are defined - bad_data_msg = std::string (); + bad_data_msg = ""; if (static_cast<double> (nvert) < idx.row_max ().max ()) { bad_data_msg = "some vertices in \"faces\" property are undefined";
--- a/libinterp/corefcn/graphics.in.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/graphics.in.h Wed Dec 30 12:33:33 2015 -0800 @@ -734,7 +734,7 @@ std::string string_value (void) const { - return value.empty () ? std::string () : value[0]; + return value.empty () ? "" : value[0]; } string_vector string_vector_value (void) const { return value; } @@ -828,7 +828,7 @@ class radio_values { public: - OCTINTERP_API radio_values (const std::string& opt_string = std::string ()); + OCTINTERP_API radio_values (const std::string& opt_string = ""); radio_values (const radio_values& a) : default_val (a.default_val), possible_vals (a.possible_vals) { } @@ -2305,7 +2305,7 @@ static std::string default_toolkit (void) { - return instance_ok () ? instance->do_default_toolkit () : std::string (); + return instance_ok () ? instance->do_default_toolkit () : ""; } private:
--- a/libinterp/corefcn/help.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/help.cc Wed Dec 30 12:33:33 2015 -0800 @@ -1201,7 +1201,7 @@ { std::string file; - type = std::string (); + type = ""; octave_value val = symbol_table::find_function (name);
--- a/libinterp/corefcn/hook-fcn.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/hook-fcn.h Wed Dec 30 12:33:33 2015 -0800 @@ -44,7 +44,7 @@ virtual ~base_hook_function (void) { } - virtual std::string id (void) { return std::string (); } + virtual std::string id (void) { return ""; } virtual bool is_valid (void) { return false; }
--- a/libinterp/corefcn/load-path.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/load-path.cc Wed Dec 30 12:33:33 2015 -0800 @@ -1099,11 +1099,11 @@ retval = find_method (class_name, meth, dir_name); } else - retval = std::string (); + retval = ""; } else { - dir_name = std::string (); + dir_name = ""; const_fcn_map_iterator p = fcn_map.find (fcn); @@ -1126,7 +1126,7 @@ break; } else - retval = std::string (); + retval = ""; } } } @@ -1173,7 +1173,7 @@ // update (); - dir_name = std::string (); + dir_name = ""; const_method_map_iterator q = method_map.find (class_name); @@ -1204,7 +1204,7 @@ break; } else - retval = std::string (); + retval = ""; } } }
--- a/libinterp/corefcn/load-path.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/load-path.h Wed Dec 30 12:33:33 2015 -0800 @@ -96,24 +96,24 @@ static std::string find_method (const std::string& class_name, const std::string& meth, std::string& dir_name, - const std::string& pack_name = std::string ()) + const std::string& pack_name = "") { return instance_ok () ? instance->get_loader (pack_name).find_method (class_name, meth, dir_name) - : std::string (); + : ""; } static std::string find_method (const std::string& class_name, const std::string& meth, - const std::string& pack_name = std::string ()) + const std::string& pack_name = "") { std::string dir_name; return find_method (class_name, meth, dir_name, pack_name); } static std::list<std::string> methods (const std::string& class_name, - const std::string& pack_name = std::string ()) + const std::string& pack_name = "") { return instance_ok () ? instance->get_loader(pack_name).methods (class_name) @@ -141,15 +141,15 @@ } static std::string find_fcn (const std::string& fcn, std::string& dir_name, - const std::string& pack_name = std::string ()) + const std::string& pack_name = "") { return instance_ok () ? instance->get_loader (pack_name).find_fcn (fcn, dir_name) - : std::string (); + : ""; } static std::string find_fcn (const std::string& fcn, - const std::string& pack_name = std::string ()) + const std::string& pack_name = "") { std::string dir_name; return find_fcn (fcn, dir_name, pack_name); @@ -157,53 +157,53 @@ static std::string find_private_fcn (const std::string& dir, const std::string& fcn, - const std::string& pack_name = std::string ()) + const std::string& pack_name = "") { return instance_ok () ? instance->get_loader (pack_name).find_private_fcn (dir, fcn) - : std::string (); + : ""; } static std::string find_fcn_file (const std::string& fcn, - const std::string& pack_name = std::string ()) + const std::string& pack_name = "") { std::string dir_name; return instance_ok () ? instance->get_loader (pack_name).find_fcn (fcn, dir_name, M_FILE) - : std::string (); + : ""; } static std::string find_oct_file (const std::string& fcn, - const std::string& pack_name = std::string ()) + const std::string& pack_name = "") { std::string dir_name; return instance_ok () ? instance->get_loader (pack_name).find_fcn (fcn, dir_name, M_FILE) - : std::string (); + : ""; } static std::string find_mex_file (const std::string& fcn, - const std::string& pack_name = std::string ()) + const std::string& pack_name = "") { std::string dir_name; return instance_ok () ? instance->get_loader (pack_name).find_fcn (fcn, dir_name, M_FILE) - : std::string (); + : ""; } static std::string find_file (const std::string& file) { return instance_ok () - ? instance->do_find_file (file) : std::string (); + ? instance->do_find_file (file) : ""; } static std::string find_dir (const std::string& dir) { return instance_ok () - ? instance->do_find_dir (dir) : std::string (); + ? instance->do_find_dir (dir) : ""; } static string_vector find_matching_dirs (const std::string& dir) @@ -215,7 +215,7 @@ static std::string find_first_of (const string_vector& files) { return instance_ok () ? - instance->do_find_first_of (files) : std::string (); + instance->do_find_first_of (files) : ""; } static string_vector find_all_first_of (const string_vector& files) @@ -248,7 +248,7 @@ static std::string path (void) { - return instance_ok () ? instance->do_path () : std::string (); + return instance_ok () ? instance->do_path () : ""; } static void display (std::ostream& os) @@ -272,12 +272,12 @@ static std::string get_command_line_path (void) { return instance_ok () ? instance->do_get_command_line_path () - : std::string (); + : ""; } static std::string system_path (void) { - return instance_ok () ? instance->do_system_path () : std::string (); + return instance_ok () ? instance->do_system_path () : ""; } private: @@ -490,7 +490,7 @@ class loader { public: - loader (const std::string& pfx = std::string ()) + loader (const std::string& pfx = "") : prefix (pfx), dir_list (), fcn_map (), private_fcn_map (), method_map () { } @@ -635,10 +635,10 @@ void do_move (dir_info_list_iterator i, bool at_end); void move (const dir_info& di, bool at_end, - const std::string& pname = std::string ()); + const std::string& pname = ""); void remove (const dir_info& di, - const std::string& pname = std::string ()); + const std::string& pname = ""); void do_initialize (bool set_initial_path); @@ -722,7 +722,7 @@ { return command_line_path; } void add (const dir_info& di, bool at_end, - const std::string& pname = std::string (), + const std::string& pname = "", bool updating = false) const; friend dir_info::fcn_file_map_type get_fcn_files (const std::string& d);
--- a/libinterp/corefcn/ls-ascii-helper.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/ls-ascii-helper.cc Wed Dec 30 12:33:33 2015 -0800 @@ -129,7 +129,7 @@ read_until_newline (std::istream& is, bool keep_newline) { if (! is) - return std::string (); + return ""; std::ostringstream buf;
--- a/libinterp/corefcn/ls-mat-ascii.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/ls-mat-ascii.cc Wed Dec 30 12:33:33 2015 -0800 @@ -110,7 +110,7 @@ static void get_lines_and_columns (std::istream& is, octave_idx_type& nr, octave_idx_type& nc, - const std::string& filename = std::string (), + const std::string& filename = "", bool quiet = false, bool check_numeric = false) { std::streampos pos = is.tellg ();
--- a/libinterp/corefcn/ls-mat5.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/ls-mat5.cc Wed Dec 30 12:33:33 2015 -0800 @@ -1206,7 +1206,7 @@ tc = cls; if (load_path::find_method (classname, "loadobj") - != std::string ()) + != "") { try { @@ -2601,7 +2601,7 @@ if (tc.is_object () && load_path::find_method (tc.class_name (), - "saveobj") != std::string ()) + "saveobj") != "") { try {
--- a/libinterp/corefcn/ls-mat5.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/ls-mat5.h Wed Dec 30 12:33:33 2015 -0800 @@ -48,7 +48,7 @@ extern int read_mat5_binary_file_header (std::istream& is, bool& swap, bool quiet = false, - const std::string& filename = std::string ()); + const std::string& filename = ""); extern std::string read_mat5_binary_element (std::istream& is, const std::string& filename, bool swap, bool& global, octave_value& tc);
--- a/libinterp/corefcn/ls-oct-text.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/ls-oct-text.cc Wed Dec 30 12:33:33 2015 -0800 @@ -246,7 +246,7 @@ error ("load: empty name keyword or no data found in file '%s'", filename.c_str ()); - return std::string (); + return ""; } if (! (name == ".nargin." || name == ".nargout."
--- a/libinterp/corefcn/oct-iostrm.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/oct-iostrm.h Wed Dec 30 12:33:33 2015 -0800 @@ -32,7 +32,7 @@ { public: - octave_base_iostream (const std::string& n = std::string (), + octave_base_iostream (const std::string& n = "", std::ios::openmode m = std::ios::in|std::ios::out, oct_mach_info::float_format ff = oct_mach_info::native_float_format ()) @@ -78,14 +78,14 @@ { public: - octave_istream (std::istream *arg = 0, const std::string& n = std::string ()) + octave_istream (std::istream *arg = 0, const std::string& n = "") : octave_base_iostream (n, std::ios::in, oct_mach_info::native_float_format ()), is (arg) { } static octave_stream - create (std::istream *arg = 0, const std::string& n = std::string ()); + create (std::istream *arg = 0, const std::string& n = ""); // Return nonzero if EOF has been reached on this stream. @@ -117,14 +117,14 @@ { public: - octave_ostream (std::ostream *arg, const std::string& n = std::string ()) + octave_ostream (std::ostream *arg, const std::string& n = "") : octave_base_iostream (n, std::ios::out, oct_mach_info::native_float_format ()), os (arg) { } static octave_stream - create (std::ostream *arg, const std::string& n = std::string ()); + create (std::ostream *arg, const std::string& n = ""); // Return nonzero if EOF has been reached on this stream.
--- a/libinterp/corefcn/oct-lvalue.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/oct-lvalue.h Wed Dec 30 12:33:33 2015 -0800 @@ -88,7 +88,7 @@ void set_index (const std::string& t, const std::list<octave_value_list>& i); - void clear_index (void) { type = std::string (); idx.clear (); } + void clear_index (void) { type = ""; idx.clear (); } std::string index_type (void) const { return type; }
--- a/libinterp/corefcn/oct-stream.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/oct-stream.cc Wed Dec 30 12:33:33 2015 -0800 @@ -4108,7 +4108,7 @@ std::string octave_stream_list::list_open_files (void) { - return (instance_ok ()) ? instance->do_list_open_files () : std::string (); + return (instance_ok ()) ? instance->do_list_open_files () : ""; } octave_value
--- a/libinterp/corefcn/oct-stream.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/oct-stream.h Wed Dec 30 12:33:33 2015 -0800 @@ -55,7 +55,7 @@ scanf_format_elt (const char *txt = 0, int w = 0, bool d = false, char typ = '\0', char mod = '\0', - const std::string& ch_class = std::string ()) + const std::string& ch_class = "") : text (strsave (txt)), width (w), discard (d), type (typ), modifier (mod), char_class (ch_class) { } @@ -106,7 +106,7 @@ { public: - scanf_format_list (const std::string& fmt = std::string ()); + scanf_format_list (const std::string& fmt = ""); ~scanf_format_list (void); @@ -174,7 +174,7 @@ void add_elt_to_list (int width, bool discard, char type, char modifier, octave_idx_type& num_elts, - const std::string& char_class = std::string ()); + const std::string& char_class = ""); void process_conversion (const std::string& s, size_t& i, size_t n, int& width, bool& discard, char& type, @@ -196,7 +196,7 @@ public: printf_format_elt (const char *txt = 0, int n = 0, int w = -1, - int p = -1, const std::string& f = std::string (), + int p = -1, const std::string& f = "", char typ = '\0', char mod = '\0') : text (strsave (txt)), args (n), fw (w), prec (p), flags (f), type (typ), modifier (mod) { } @@ -252,7 +252,7 @@ { public: - printf_format_list (const std::string& fmt = std::string ()); + printf_format_list (const std::string& fmt = ""); ~printf_format_list (void); @@ -692,14 +692,14 @@ static int insert (octave_stream& os); static octave_stream - lookup (int fid, const std::string& who = std::string ()); + lookup (int fid, const std::string& who = ""); static octave_stream - lookup (const octave_value& fid, const std::string& who = std::string ()); + lookup (const octave_value& fid, const std::string& who = ""); - static int remove (int fid, const std::string& who = std::string ()); + static int remove (int fid, const std::string& who = ""); static int remove (const octave_value& fid, - const std::string& who = std::string ()); + const std::string& who = ""); static void clear (bool flush = true); @@ -727,13 +727,13 @@ int do_insert (octave_stream& os); octave_stream do_lookup (int fid, - const std::string& who = std::string ()) const; + const std::string& who = "") const; octave_stream do_lookup (const octave_value& fid, - const std::string& who = std::string ()) const; + const std::string& who = "") const; - int do_remove (int fid, const std::string& who = std::string ()); + int do_remove (int fid, const std::string& who = ""); int do_remove (const octave_value& fid, - const std::string& who = std::string ()); + const std::string& who = ""); void do_clear (bool flush = true);
--- a/libinterp/corefcn/oct-strstrm.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/oct-strstrm.h Wed Dec 30 12:33:33 2015 -0800 @@ -48,7 +48,7 @@ // The name of the file. - std::string name (void) const { return std::string (); } + std::string name (void) const { return ""; } virtual std::streambuf *rdbuf (void) = 0;
--- a/libinterp/corefcn/regexp.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/regexp.cc Wed Dec 30 12:33:33 2015 -0800 @@ -395,7 +395,7 @@ regexp::match_data::const_iterator p = rx_lst.begin (); retval(4) = sz ? p->tokens () : Cell (); - retval(3) = sz ? p->match_string () : std::string (); + retval(3) = sz ? p->match_string () : ""; retval(2) = sz ? p->token_extents () : Matrix (); if (sz)
--- a/libinterp/corefcn/schur.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/schur.cc Wed Dec 30 12:33:33 2015 -0800 @@ -143,12 +143,12 @@ if (ord == "real") { - ord = std::string (); + ord = ""; } else if (ord == "complex") { force_complex = true; - ord = std::string (); + ord = ""; } else {
--- a/libinterp/corefcn/sqrtm.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/sqrtm.cc Wed Dec 30 12:33:33 2015 -0800 @@ -177,7 +177,7 @@ do { - ComplexSCHUR schur (x, std::string (), true); + ComplexSCHUR schur (x, "", true); x = schur.schur_matrix (); u = schur.unitary_matrix (); }
--- a/libinterp/corefcn/strfns.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/strfns.cc Wed Dec 30 12:33:33 2015 -0800 @@ -355,7 +355,7 @@ boolNDArray output (cell_val.dims (), false); - std::string s = r == 0 ? std::string () : str[0]; + std::string s = r == 0 ? "" : str[0]; if (cell_val.is_cellstr ()) {
--- a/libinterp/corefcn/symtab.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/symtab.cc Wed Dec 30 12:33:33 2015 -0800 @@ -185,8 +185,8 @@ static inline bool load_out_of_date_fcn (const std::string& ff, const std::string& dir_name, octave_value& function, - const std::string& dispatch_type = std::string (), - const std::string& package_name = std::string ()) + const std::string& dispatch_type = "", + const std::string& package_name = "") { bool retval = false; @@ -1165,7 +1165,7 @@ { const octave_function *f = fcn.function_value (); - return f ? f->fcn_file_name () : std::string (); + return f ? f->fcn_file_name () : ""; } void
--- a/libinterp/corefcn/symtab.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/symtab.h Wed Dec 30 12:33:33 2015 -0800 @@ -483,7 +483,7 @@ public: symbol_record (scope_id s = xcurrent_scope, - const std::string& nm = std::string (), + const std::string& nm = "", const octave_value& v = octave_value (), unsigned int sc = local) : rep (new symbol_record_rep (s, nm, v, sc)) { } @@ -640,7 +640,7 @@ void set_curr_fcn (octave_user_function *fcn) { rep->set_curr_fcn (fcn); } void - dump (std::ostream& os, const std::string& prefix = std::string ()) const + dump (std::ostream& os, const std::string& prefix = "") const { rep->dump (os, prefix); } @@ -982,7 +982,7 @@ public: - fcn_info (const std::string& nm = std::string ()) + fcn_info (const std::string& nm = "") : rep (new fcn_info_rep (nm)) { } fcn_info (const fcn_info& fi) : rep (fi.rep) @@ -1143,7 +1143,7 @@ } void - dump (std::ostream& os, const std::string& prefix = std::string ()) const + dump (std::ostream& os, const std::string& prefix = "") const { rep->dump (os, prefix); } @@ -2912,7 +2912,7 @@ }; extern bool out_of_date_check (octave_value& function, - const std::string& dispatch_type = std::string (), + const std::string& dispatch_type = "", bool check_relative = true); extern OCTINTERP_API std::string
--- a/libinterp/corefcn/sysdep.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/sysdep.cc Wed Dec 30 12:33:33 2015 -0800 @@ -653,7 +653,7 @@ std::string val = (nargin == 2 ? args(1).xstring_value ("setenv: VALUE must be a string") - : std::string ()); + : ""); octave_env::putenv (var, val);
--- a/libinterp/corefcn/toplev.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/toplev.cc Wed Dec 30 12:33:33 2015 -0800 @@ -107,7 +107,7 @@ std::string octave_call_stack::stack_frame::fcn_file_name (void) const { - return m_fcn ? m_fcn->fcn_file_name () : std::string (); + return m_fcn ? m_fcn->fcn_file_name () : ""; } std::string
--- a/libinterp/corefcn/urlwrite.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/urlwrite.cc Wed Dec 30 12:33:33 2015 -0800 @@ -510,7 +510,7 @@ std::string passwd = (nargin > 2) ? args(2).xstring_value ("__ftp__: PASSWD must be a string") - : std::string (); + : ""; curl_handle ch = ch_manager::make_curl_handle (host, user, passwd, octave_stdout);
--- a/libinterp/corefcn/variables.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/variables.cc Wed Dec 30 12:33:33 2015 -0800 @@ -1102,7 +1102,7 @@ struct symbol_info { symbol_info (const symbol_table::symbol_record& sr, - const std::string& expr_str = std::string (), + const std::string& expr_str = "", const octave_value& expr_val = octave_value ()) : name (expr_str.empty () ? sr.name () : expr_str), varval (expr_val.is_undefined () ? sr.varval () : expr_val), @@ -1589,7 +1589,7 @@ static octave_value do_who (int argc, const string_vector& argv, bool return_list, - bool verbose = false, std::string msg = std::string ()) + bool verbose = false, std::string msg = "") { octave_value retval;
--- a/libinterp/corefcn/variables.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/corefcn/variables.h Wed Dec 30 12:33:33 2015 -0800 @@ -46,11 +46,11 @@ extern OCTINTERP_API void clear_mex_functions (void); extern OCTINTERP_API octave_function * -is_valid_function (const octave_value&, const std::string& = std::string (), +is_valid_function (const octave_value&, const std::string& = "", bool warn = false); extern OCTINTERP_API octave_function * -is_valid_function (const std::string&, const std::string& = std::string (), +is_valid_function (const std::string&, const std::string& = "", bool warn = false); extern OCTINTERP_API octave_function *
--- a/libinterp/octave-value/ov-builtin.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-builtin.h Wed Dec 30 12:33:33 2015 -0800 @@ -44,8 +44,8 @@ typedef octave_value_list (*fcn) (const octave_value_list&, int); - octave_builtin (fcn ff, const std::string& nm = std::string (), - const std::string& ds = std::string ()) + octave_builtin (fcn ff, const std::string& nm = "", + const std::string& ds = "") : octave_function (nm, ds), f (ff), file (), jtype (0) { } octave_builtin (fcn ff, const std::string& nm, const std::string& fnm,
--- a/libinterp/octave-value/ov-cell.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-cell.cc Wed Dec 30 12:33:33 2015 -0800 @@ -603,7 +603,7 @@ else if (pad) retval[k++] = std::string (max_len, ' '); else - retval[k++] = std::string (); + retval[k++] = ""; } return retval; @@ -794,7 +794,7 @@ bool dummy; // recurse to read cell elements - std::string nm = read_text_data (is, std::string (), + std::string nm = read_text_data (is, "", dummy, t2, i); if (nm != CELL_ELT_TAG) @@ -829,7 +829,7 @@ bool dummy; // recurse to read cell elements - std::string nm = read_text_data (is, std::string (), + std::string nm = read_text_data (is, "", dummy, t2, i); if (nm != CELL_ELT_TAG) @@ -939,7 +939,7 @@ std::string doc; // recurse to read cell elements - std::string nm = read_binary_data (is, swap, fmt, std::string (), + std::string nm = read_binary_data (is, swap, fmt, "", dummy, t2, doc); if (nm != CELL_ELT_TAG) @@ -1282,7 +1282,7 @@ { string_vector s = args(0).xstring_vector_value ("cellstr: argument STRING must be a 2-D character array"); - return ovl (s.is_empty () ? Cell (octave_value (std::string ())) + return ovl (s.is_empty () ? Cell (octave_value ("")) : Cell (s, true)); } }
--- a/libinterp/octave-value/ov-class.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-class.cc Wed Dec 30 12:33:33 2015 -0800 @@ -1168,7 +1168,7 @@ { os << "# classname: " << class_name () << "\n"; octave_map m; - if (load_path::find_method (class_name (), "saveobj") != std::string ()) + if (load_path::find_method (class_name (), "saveobj") != "") { octave_value in = new octave_class (*this); octave_value_list tmp = feval ("saveobj", in, 1); @@ -1219,7 +1219,7 @@ // recurse to read cell elements std::string nm - = read_text_data (is, std::string (), dummy, t2, j); + = read_text_data (is, "", dummy, t2, j); if (! is) break; @@ -1241,7 +1241,7 @@ warning ("load: unable to reconstruct object inheritance"); if (load_path::find_method (classname, "loadobj") - != std::string ()) + != "") { octave_value in = new octave_class (*this); octave_value_list tmp = feval ("loadobj", in, 1); @@ -1269,7 +1269,7 @@ os << class_name (); octave_map m; - if (load_path::find_method (class_name (), "saveobj") != std::string ()) + if (load_path::find_method (class_name (), "saveobj") != "") { octave_value in = new octave_class (*this); octave_value_list tmp = feval ("saveobj", in, 1); @@ -1338,7 +1338,7 @@ std::string doc; // recurse to read cell elements - std::string nm = read_binary_data (is, swap, fmt, std::string (), + std::string nm = read_binary_data (is, swap, fmt, "", dummy, t2, doc); if (! is) @@ -1356,7 +1356,7 @@ if (! reconstruct_parents ()) warning ("load: unable to reconstruct object inheritance"); - if (load_path::find_method (c_name, "loadobj") != std::string ()) + if (load_path::find_method (c_name, "loadobj") != "") { octave_value in = new octave_class (*this); octave_value_list tmp = feval ("loadobj", in, 1); @@ -1429,7 +1429,7 @@ if (data_hid < 0) goto error_cleanup; - if (load_path::find_method (class_name (), "saveobj") != std::string ()) + if (load_path::find_method (class_name (), "saveobj") != "") { octave_value in = new octave_class (*this); octave_value_list tmp = feval ("saveobj", in, 1); @@ -1591,7 +1591,7 @@ if (! reconstruct_parents ()) warning ("load: unable to reconstruct object inheritance"); - if (load_path::find_method (c_name, "loadobj") != std::string ()) + if (load_path::find_method (c_name, "loadobj") != "") { octave_value in = new octave_class (*this); octave_value_list tmp = feval ("loadobj", in, 1); @@ -1929,7 +1929,7 @@ std::string method = args(1).string_value (); - if (load_path::find_method (class_name, method) != std::string ()) + if (load_path::find_method (class_name, method) != "") return ovl (true); else return ovl (false);
--- a/libinterp/octave-value/ov-classdef.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-classdef.cc Wed Dec 30 12:33:33 2015 -0800 @@ -310,8 +310,8 @@ static bool check_access (const cdef_class& cls, const octave_value& acc, - const std::string& meth_name = std::string (), - const std::string& prop_name = std::string (), + const std::string& meth_name = "", + const std::string& prop_name = "", bool is_prop_set = false) { if (acc.is_string ()) @@ -655,8 +655,8 @@ cls.put ("Abstract", false); cls.put ("ConstructOnLoad", false); cls.put ("ContainingPackage", Matrix ()); - cls.put ("Description", std::string ()); - cls.put ("DetailedDescription", std::string ()); + cls.put ("Description", ""); + cls.put ("DetailedDescription", ""); cls.put ("Events", Cell ()); cls.put ("Hidden", false); cls.put ("InferiorClasses", Cell ()); @@ -728,8 +728,8 @@ cdef_property prop (name); prop.set_class (cdef_class::meta_property ()); - prop.put ("Description", std::string ()); - prop.put ("DetailedDescription", std::string ()); + prop.put ("Description", ""); + prop.put ("DetailedDescription", ""); prop.put ("Abstract", false); prop.put ("Constant", false); prop.put ("GetAccess", get_access); @@ -772,8 +772,8 @@ meth.put ("Abstract", false); meth.put ("Access", m_access); meth.put ("DefiningClass", to_ov (cls)); - meth.put ("Description", std::string ()); - meth.put ("DetailedDescription", std::string ()); + meth.put ("Description", ""); + meth.put ("DetailedDescription", ""); meth.put ("Hidden", false); meth.put ("Sealed", true); meth.put ("Static", is_static); @@ -801,7 +801,7 @@ static cdef_package make_package (const std::string& nm, - const std::string& parent = std::string ()) + const std::string& parent = "") { cdef_package pack (nm); @@ -1072,7 +1072,7 @@ { return object.meta_is_postfix_index_handled (type); } bool - is_classdef_constructor (const std::string& cname = std::string ()) const + is_classdef_constructor (const std::string& cname = "") const { bool retval = false; @@ -3016,7 +3016,7 @@ { cdef_class cls (to_cdef (get ("DefiningClass"))); - return ::check_access (cls, get ("GetAccess"), std::string (), + return ::check_access (cls, get ("GetAccess"), "", get_name (), false); return false; @@ -3027,7 +3027,7 @@ { cdef_class cls (to_cdef (get ("DefiningClass"))); - return ::check_access (cls, get ("SetAccess"), std::string (), + return ::check_access (cls, get ("SetAccess"), "", get_name (), true); return false; @@ -3692,7 +3692,7 @@ size_t pos = name.find ('.'); if (pos == std::string::npos) - retval = make_package (name, std::string ()); + retval = make_package (name, ""); else { std::string parent_name = name.substr (0, pos);
--- a/libinterp/octave-value/ov-classdef.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-classdef.h Wed Dec 30 12:33:33 2015 -0800 @@ -938,15 +938,15 @@ bool is_constant (void) const { return get("Constant").bool_value (); } octave_value get_value (bool do_check_access = true, - const std::string& who = std::string ()); + const std::string& who = ""); octave_value get_value (const cdef_object& obj, bool do_check_access = true, - const std::string& who = std::string ()); + const std::string& who = ""); void set_value (cdef_object& obj, const octave_value& val, bool do_check_access = true, - const std::string& who = std::string ()); + const std::string& who = ""); bool check_get_access (void) const; @@ -992,16 +992,16 @@ } octave_value get_value (const cdef_object& obj, bool do_check_access = true, - const std::string& who = std::string ()) + const std::string& who = "") { return get_rep ()->get_value (obj, do_check_access, who); } octave_value get_value (bool do_check_access = true, - const std::string& who = std::string ()) + const std::string& who = "") { return get_rep ()->get_value (do_check_access, who); } void set_value (cdef_object& obj, const octave_value& val, bool do_check_access = true, - const std::string& who = std::string ()) + const std::string& who = "") { get_rep ()->set_value (obj, val, do_check_access, who); } bool check_get_access (void) const @@ -1060,12 +1060,12 @@ octave_value_list execute (const octave_value_list& args, int nargout, bool do_check_access = true, - const std::string& who = std::string ()); + const std::string& who = ""); octave_value_list execute (const cdef_object& obj, const octave_value_list& args, int nargout, bool do_check_access = true, - const std::string& who = std::string ()); + const std::string& who = ""); bool is_constructor (void) const; @@ -1127,14 +1127,14 @@ // normal invocation octave_value_list execute (const octave_value_list& args, int nargout, bool do_check_access = true, - const std::string& who = std::string ()) + const std::string& who = "") { return get_rep ()->execute (args, nargout, do_check_access, who); } // dot-invocation: object is pushed as 1st argument octave_value_list execute (const cdef_object& obj, const octave_value_list& args, int nargout, bool do_check_access = true, - const std::string& who = std::string ()) + const std::string& who = "") { return get_rep ()->execute (obj, args, nargout, do_check_access, who); } bool check_access (void) const { return get_rep ()->check_access (); }
--- a/libinterp/octave-value/ov-dld-fcn.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-dld-fcn.h Wed Dec 30 12:33:33 2015 -0800 @@ -49,8 +49,8 @@ { } octave_dld_function (octave_builtin::fcn ff, const octave_shlib& shl, - const std::string& nm = std::string (), - const std::string& ds = std::string ()); + const std::string& nm = "", + const std::string& ds = ""); ~octave_dld_function (void); @@ -70,8 +70,8 @@ static octave_dld_function* create (octave_builtin::fcn ff, const octave_shlib& shl, - const std::string& nm = std::string (), - const std::string& ds = std::string ()); + const std::string& nm = "", + const std::string& ds = ""); octave_shlib get_shlib (void) const { return sh_lib; }
--- a/libinterp/octave-value/ov-fcn-handle.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-fcn-handle.cc Wed Dec 30 12:33:33 2015 -0800 @@ -148,7 +148,7 @@ { octave_value_list retval; - out_of_date_check (fcn, std::string (), false); + out_of_date_check (fcn, "", false); if (has_overloads) { @@ -369,7 +369,7 @@ else { octave_function *f = function_value (); - std::string fnm = f ? f->fcn_file_name () : std::string (); + std::string fnm = f ? f->fcn_file_name () : ""; os << "# octaveroot: " << OCTAVE_EXEC_PREFIX << "\n"; if (! fnm.empty ()) @@ -444,7 +444,7 @@ bool dummy; std::string name - = read_text_data (is, std::string (), dummy, t2, i); + = read_text_data (is, "", dummy, t2, i); if (! is) error ("load: failed to load anonymous function handle"); @@ -544,7 +544,7 @@ std::ostringstream nmbuf; octave_function *f = function_value (); - std::string fnm = f ? f->fcn_file_name () : std::string (); + std::string fnm = f ? f->fcn_file_name () : ""; nmbuf << nm << "\n" << OCTAVE_EXEC_PREFIX << "\n" << fnm; @@ -625,7 +625,7 @@ std::string doc; std::string name = - read_binary_data (is, swap, fmt, std::string (), + read_binary_data (is, swap, fmt, "", dummy, t2, doc); if (! is) @@ -834,7 +834,7 @@ std::string octaveroot = OCTAVE_EXEC_PREFIX; octave_function *f = function_value (); - std::string fpath = f ? f->fcn_file_name () : std::string (); + std::string fpath = f ? f->fcn_file_name () : ""; H5Sclose (space_hid); hdims[0] = 1;
--- a/libinterp/octave-value/ov-fcn-inline.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-fcn-inline.cc Wed Dec 30 12:33:33 2015 -0800 @@ -724,7 +724,7 @@ terminate_arg = true; else { - tmp_arg = std::string (); + tmp_arg = ""; is_arg = false; } } @@ -762,7 +762,7 @@ && tmp_arg != "e" && tmp_arg != "eps") fargs.append (tmp_arg); - tmp_arg = std::string (); + tmp_arg = ""; is_arg = false; } }
--- a/libinterp/octave-value/ov-fcn-inline.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-fcn-inline.h Wed Dec 30 12:33:33 2015 -0800 @@ -46,7 +46,7 @@ : octave_fcn_handle (), iftext (), ifargs () { } octave_fcn_inline (const std::string& f, const string_vector& a, - const std::string& n = std::string ()); + const std::string& n = ""); octave_fcn_inline (const octave_fcn_inline& fi) : octave_fcn_handle (fi), iftext (fi.iftext), ifargs (fi.ifargs) { }
--- a/libinterp/octave-value/ov-fcn.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-fcn.h Wed Dec 30 12:33:33 2015 -0800 @@ -59,14 +59,14 @@ virtual bool is_system_fcn_file (void) const { return false; } - virtual std::string fcn_file_name (void) const { return std::string (); } + virtual std::string fcn_file_name (void) const { return ""; } - virtual std::string src_file_name (void) const { return std::string (); } + virtual std::string src_file_name (void) const { return ""; } // The name to show in the profiler (also used as map-key). virtual std::string profiler_name (void) const { return name (); } - virtual std::string parent_fcn_name (void) const { return std::string (); } + virtual std::string parent_fcn_name (void) const { return ""; } virtual symbol_table::scope_id parent_fcn_scope (void) const { return -1; } @@ -82,14 +82,14 @@ virtual bool is_subfunction (void) const { return false; } - virtual bool is_class_constructor (const std::string& = std::string ()) const + virtual bool is_class_constructor (const std::string& = "") const { return false; } virtual bool - is_classdef_constructor (const std::string& = std::string ()) const + is_classdef_constructor (const std::string& = "") const { return false; } - virtual bool is_class_method (const std::string& = std::string ()) const + virtual bool is_class_method (const std::string& = "") const { return false; } virtual bool takes_varargs (void) const { return false; } @@ -105,7 +105,7 @@ std::string package_name (void) const { return xpackage_name; } virtual void - mark_as_private_function (const std::string& cname = std::string ()) + mark_as_private_function (const std::string& cname = "") { private_function = true; xdispatch_class = cname; @@ -117,7 +117,7 @@ { return private_function && xdispatch_class == nm; } virtual bool - is_anonymous_function_of_class (const std::string& = std::string ()) const + is_anonymous_function_of_class (const std::string& = "") const { return false; } std::string dir_name (void) const { return my_dir_name; } @@ -182,7 +182,7 @@ protected: octave_function (const std::string& nm, - const std::string& ds = std::string ()) + const std::string& ds = "") : relative (false), locked (false), private_function (false), xdispatch_class (), my_name (nm), my_dir_name (), doc (ds) { }
--- a/libinterp/octave-value/ov-lazy-idx.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-lazy-idx.cc Wed Dec 30 12:33:33 2015 -0800 @@ -168,7 +168,7 @@ { bool dummy; - std::string nm = read_text_data (is, std::string (), dummy, value, 0); + std::string nm = read_text_data (is, "", dummy, value, 0); if (nm != value_save_tag) error ("lazy_index: corrupted data on load"); @@ -182,7 +182,7 @@ bool octave_lazy_index::save_binary (std::ostream& os, bool& save_as_floats) { return save_binary_data (os, make_value (), value_save_tag, - std::string (), false, save_as_floats); + "", false, save_as_floats); } bool octave_lazy_index::load_binary (std::istream& is, bool swap, @@ -191,7 +191,7 @@ bool dummy; std::string doc; - std::string nm = read_binary_data (is, swap, fmt, std::string (), + std::string nm = read_binary_data (is, swap, fmt, "", dummy, value, doc); if (nm != value_save_tag)
--- a/libinterp/octave-value/ov-mex-fcn.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-mex-fcn.h Wed Dec 30 12:33:33 2015 -0800 @@ -48,7 +48,7 @@ t_checked (), system_fcn_file () { } octave_mex_function (void *fptr, bool fmex, const octave_shlib& shl, - const std::string& nm = std::string ()); + const std::string& nm = ""); ~octave_mex_function (void);
--- a/libinterp/octave-value/ov-struct.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-struct.cc Wed Dec 30 12:33:33 2015 -0800 @@ -741,7 +741,7 @@ // recurse to read cell elements std::string nm - = read_text_data (is, std::string (), dummy, t2, j); + = read_text_data (is, "", dummy, t2, j); if (! is) break; @@ -853,7 +853,7 @@ std::string doc; // recurse to read cell elements - std::string nm = read_binary_data (is, swap, fmt, std::string (), + std::string nm = read_binary_data (is, swap, fmt, "", dummy, t2, doc); if (! is) @@ -1380,7 +1380,7 @@ // recurse to read cell elements std::string nm - = read_text_data (is, std::string (), dummy, t2, j); + = read_text_data (is, "", dummy, t2, j); if (! is) break; @@ -1454,7 +1454,7 @@ std::string doc; // recurse to read cell elements - std::string nm = read_binary_data (is, swap, fmt, std::string (), + std::string nm = read_binary_data (is, swap, fmt, "", dummy, t2, doc); if (! is)
--- a/libinterp/octave-value/ov-typeinfo.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-typeinfo.cc Wed Dec 30 12:33:33 2015 -0800 @@ -195,7 +195,7 @@ { len *= 2; - types.resize (dim_vector (len, 1), std::string ()); + types.resize (dim_vector (len, 1), ""); vals.resize (dim_vector (len, 1), octave_value ());
--- a/libinterp/octave-value/ov-typeinfo.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-typeinfo.h Wed Dec 30 12:33:33 2015 -0800 @@ -192,7 +192,7 @@ protected: octave_value_typeinfo (void) - : num_types (0), types (dim_vector (init_tab_sz, 1), std::string ()), + : num_types (0), types (dim_vector (init_tab_sz, 1), ""), vals (dim_vector (init_tab_sz, 1)), unary_class_ops (dim_vector (octave_value::num_unary_ops, 1), 0), unary_ops (dim_vector (octave_value::num_unary_ops, init_tab_sz), 0),
--- a/libinterp/octave-value/ov-usr-fcn.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-usr-fcn.cc Wed Dec 30 12:33:33 2015 -0800 @@ -179,7 +179,7 @@ octave_user_function::octave_user_function (symbol_table::scope_id sid, tree_parameter_list *pl, tree_parameter_list *rl, tree_statement_list *cl) - : octave_user_code (std::string (), std::string ()), + : octave_user_code ("", ""), param_list (pl), ret_list (rl), cmd_list (cl), lead_comm (), trail_comm (), file_name (), location_line (0), location_column (0),
--- a/libinterp/octave-value/ov-usr-fcn.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov-usr-fcn.h Wed Dec 30 12:33:33 2015 -0800 @@ -66,7 +66,7 @@ protected: octave_user_code (const std::string& nm, - const std::string& ds = std::string ()) + const std::string& ds = "") : octave_function (nm, ds) { } private: @@ -89,10 +89,10 @@ octave_user_script (const std::string& fnm, const std::string& nm, tree_statement_list *cmds, - const std::string& ds = std::string ()); + const std::string& ds = ""); octave_user_script (const std::string& fnm, const std::string& nm, - const std::string& ds = std::string ()); + const std::string& ds = ""); ~octave_user_script (void); @@ -266,7 +266,7 @@ bool takes_var_return (void) const; - void mark_as_private_function (const std::string& cname = std::string ()) + void mark_as_private_function (const std::string& cname = "") { symbol_table::mark_subfunctions_in_scope_as_private (local_scope, cname); @@ -305,7 +305,7 @@ bool is_anonymous_function (void) const { return anonymous_function; } bool is_anonymous_function_of_class - (const std::string& cname = std::string ()) const + (const std::string& cname = "") const { return anonymous_function ? (cname.empty () @@ -330,13 +330,13 @@ void mark_as_classdef_constructor (void) { class_constructor = classdef; } - bool is_class_constructor (const std::string& cname = std::string ()) const + bool is_class_constructor (const std::string& cname = "") const { return class_constructor == legacy ? (cname.empty () ? true : cname == dispatch_class ()) : false; } - bool is_classdef_constructor (const std::string& cname = std::string ()) const + bool is_classdef_constructor (const std::string& cname = "") const { return class_constructor == classdef ? (cname.empty () ? true : cname == dispatch_class ()) : false; @@ -344,7 +344,7 @@ void mark_as_class_method (void) { class_method = true; } - bool is_class_method (const std::string& cname = std::string ()) const + bool is_class_method (const std::string& cname = "") const { return class_method ? (cname.empty () ? true : cname == dispatch_class ()) : false;
--- a/libinterp/octave-value/ov.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ov.h Wed Dec 30 12:33:33 2015 -0800 @@ -1256,7 +1256,7 @@ bool is_copy_of (const octave_value &val) const { return rep == val.rep; } void print_info (std::ostream& os, - const std::string& prefix = std::string ()) const; + const std::string& prefix = "") const; bool save_ascii (std::ostream& os) { return rep->save_ascii (os); }
--- a/libinterp/octave-value/ovl.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave-value/ovl.h Wed Dec 30 12:33:33 2015 -0800 @@ -132,7 +132,7 @@ bool has_magic_colon (void) const; - string_vector make_argv (const std::string& = std::string ()) const; + string_vector make_argv (const std::string& = "") const; void stash_name_tags (const string_vector& nm) { names = nm; }
--- a/libinterp/octave.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/octave.cc Wed Dec 30 12:33:33 2015 -0800 @@ -272,9 +272,9 @@ static void safe_source_file (const std::string& file_name, - const std::string& context = std::string (), + const std::string& context = "", bool verbose = false, bool require_file = true, - const std::string& warn_for = std::string ()) + const std::string& warn_for = "") { try {
--- a/libinterp/parse-tree/lex.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/parse-tree/lex.h Wed Dec 30 12:33:33 2015 -0800 @@ -771,7 +771,7 @@ { public: - octave_push_lexer (const std::string& input = std::string (), + octave_push_lexer (const std::string& input = "", bool eof = false) : octave_base_lexer (), pflag (1) {
--- a/libinterp/parse-tree/parse.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/parse-tree/parse.h Wed Dec 30 12:33:33 2015 -0800 @@ -103,17 +103,17 @@ extern OCTINTERP_API octave_function * load_fcn_from_file (const std::string& file_name, - const std::string& dir_name = std::string (), - const std::string& dispatch_type = std::string (), - const std::string& package_name = std::string (), - const std::string& fcn_name = std::string (), + const std::string& dir_name = "", + const std::string& dispatch_type = "", + const std::string& package_name = "", + const std::string& fcn_name = "", bool autoload = false); extern OCTINTERP_API void source_file (const std::string& file_name, - const std::string& context = std::string (), + const std::string& context = "", bool verbose = false, bool require_file = true, - const std::string& warn_for = std::string ()); + const std::string& warn_for = ""); extern OCTINTERP_API octave_value_list feval (const std::string& name,
--- a/libinterp/parse-tree/pt-classdef.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/parse-tree/pt-classdef.h Wed Dec 30 12:33:33 2015 -0800 @@ -592,7 +592,7 @@ tree_classdef_superclass_list *sc, tree_classdef_body *b, octave_comment_list *lc, octave_comment_list *tc, - const std::string& pn = std::string (), int l = -1, + const std::string& pn = "", int l = -1, int c = -1) : tree_command (l, c), attr_list (a), id (i), supclass_list (sc), element_list (b), lead_comm (lc), trail_comm (tc),
--- a/libinterp/parse-tree/pt-exp.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/parse-tree/pt-exp.cc Wed Dec 30 12:33:33 2015 -0800 @@ -77,5 +77,5 @@ std::string tree_expression::original_text (void) const { - return std::string (); + return ""; }
--- a/libinterp/parse-tree/pt-pr-code.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/parse-tree/pt-pr-code.h Wed Dec 30 12:33:33 2015 -0800 @@ -40,7 +40,7 @@ public: tree_print_code (std::ostream& os_arg, - const std::string& pfx = std::string (), + const std::string& pfx = "", bool pr_orig_txt = true) : os (os_arg), prefix (pfx), nesting (), print_original_text (pr_orig_txt),
--- a/libinterp/parse-tree/token.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/parse-tree/token.h Wed Dec 30 12:33:33 2015 -0800 @@ -65,7 +65,7 @@ token (int tv, bool is_keyword, int l = -1, int c = -1); token (int tv, const char *s, int l = -1, int c = -1); token (int tv, const std::string& s, int l = -1, int c = -1); - token (int tv, double d, const std::string& s = std::string (), + token (int tv, double d, const std::string& s = "", int l = -1, int c = -1); token (int tv, end_tok_type t, int l = -1, int c = -1); token (int tv, symbol_table::symbol_record *s, int l = -1, int c = -1);
--- a/libinterp/version.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/version.cc Wed Dec 30 12:33:33 2015 -0800 @@ -30,7 +30,7 @@ #include "version.h" static std::string -octave_warranty_statement (const std::string& extra_info = std::string ()) +octave_warranty_statement (const std::string& extra_info = "") { return "There is ABSOLUTELY NO WARRANTY; not even for MERCHANTABILITY or\n\ FITNESS FOR A PARTICULAR PURPOSE."
--- a/libinterp/version.in.h Wed Dec 30 11:43:29 2015 -0800 +++ b/libinterp/version.in.h Wed Dec 30 12:33:33 2015 -0800 @@ -58,11 +58,11 @@ extern OCTINTERP_API std::string octave_name_version_copyright_copying_and_warranty - (bool html = false, const std::string& extra_info = std::string ()); + (bool html = false, const std::string& extra_info = ""); extern OCTINTERP_API std::string octave_name_version_copyright_copying_warranty_and_bugs - (bool html = false, const std::string& extra_info = std::string ()); + (bool html = false, const std::string& extra_info = ""); extern OCTINTERP_API std::string octave_startup_message (bool html = false);
--- a/liboctave/numeric/oct-rand.h Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/numeric/oct-rand.h Wed Dec 30 12:33:33 2015 -0800 @@ -66,14 +66,14 @@ } // Return the current state. - static ColumnVector state (const std::string& d = std::string ()) + static ColumnVector state (const std::string& d = "") { return instance_ok () ? instance->do_state (d) : ColumnVector (); } // Set the current state/ static void state (const ColumnVector &s, - const std::string& d = std::string ()) + const std::string& d = "") { if (instance_ok ()) instance->do_state (s, d); @@ -89,7 +89,7 @@ // Return the current distribution. static std::string distribution (void) { - return instance_ok () ? instance->do_distribution () : std::string (); + return instance_ok () ? instance->do_distribution () : ""; } // Set the current distribution. May be either "uniform" (the
--- a/liboctave/system/dir-ops.h Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/system/dir-ops.h Wed Dec 30 12:33:33 2015 -0800 @@ -33,7 +33,7 @@ { public: - dir_entry (const std::string& n = std::string ()) + dir_entry (const std::string& n = "") : name (n), dir (0), fail (false), errmsg () { if (! name.empty ()) @@ -58,7 +58,7 @@ ~dir_entry (void) { close (); } - bool open (const std::string& = std::string ()); + bool open (const std::string& = ""); string_vector read (void); @@ -68,7 +68,7 @@ operator bool () const { return ok (); } - std::string error (void) const { return ok () ? std::string () : errmsg; } + std::string error (void) const { return ok () ? "" : errmsg; } private:
--- a/liboctave/system/file-ops.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/system/file-ops.cc Wed Dec 30 12:33:33 2015 -0800 @@ -402,7 +402,7 @@ int octave_mkdir (const std::string& name, mode_t mode, std::string& msg) { - msg = std::string (); + msg = ""; int status = -1; @@ -424,7 +424,7 @@ int octave_mkfifo (const std::string& name, mode_t mode, std::string& msg) { - msg = std::string (); + msg = ""; int status = -1; @@ -451,7 +451,7 @@ octave_link (const std::string& old_name, const std::string& new_name, std::string& msg) { - msg = std::string (); + msg = ""; int status = -1; @@ -474,7 +474,7 @@ octave_symlink (const std::string& old_name, const std::string& new_name, std::string& msg) { - msg = std::string (); + msg = ""; int status = -1; @@ -499,7 +499,7 @@ { int status = -1; - msg = std::string (); + msg = ""; char buf[MAXPATHLEN+1]; @@ -530,7 +530,7 @@ { int status = -1; - msg = std::string (); + msg = ""; status = gnulib::rename (from.c_str (), to.c_str ()); @@ -550,7 +550,7 @@ int octave_rmdir (const std::string& name, std::string& msg) { - msg = std::string (); + msg = ""; int status = -1; @@ -574,7 +574,7 @@ int octave_recursive_rmdir (const std::string& name, std::string& msg) { - msg = std::string (); + msg = ""; int status = 0; @@ -659,7 +659,7 @@ int octave_unlink (const std::string& name, std::string& msg) { - msg = std::string (); + msg = ""; int status = -1; @@ -682,7 +682,7 @@ octave_tempnam (const std::string& dir, const std::string& pfx, std::string& msg) { - msg = std::string (); + msg = ""; std::string retval; @@ -730,7 +730,7 @@ std::string octave_canonicalize_file_name (const std::string& name, std::string& msg) { - msg = std::string (); + msg = ""; std::string retval;
--- a/liboctave/system/file-ops.h Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/system/file-ops.h Wed Dec 30 12:33:33 2015 -0800 @@ -62,12 +62,12 @@ static std::string dir_sep_str (void) { - return instance_ok () ? instance->xdir_sep_str : std::string (); + return instance_ok () ? instance->xdir_sep_str : ""; } static std::string dir_sep_chars (void) { - return instance_ok () ? instance->xdir_sep_chars : std::string (); + return instance_ok () ? instance->xdir_sep_chars : ""; } static bool is_dir_sep (char c)
--- a/liboctave/system/file-stat.h Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/system/file-stat.h Wed Dec 30 12:33:33 2015 -0800 @@ -133,7 +133,7 @@ bool exists (void) const { return ok (); } - std::string error (void) const { return ok () ? std::string () : errmsg; } + std::string error (void) const { return ok () ? "" : errmsg; } // Has the file referenced by this object been modified since TIME? bool is_newer (const octave_time& time) const { return fs_mtime > time; } @@ -201,7 +201,7 @@ { public: - file_stat (const std::string& n = std::string (), bool fl = true) + file_stat (const std::string& n = "", bool fl = true) : base_file_stat (), file_name (n), follow_links (fl) { if (! file_name.empty ())
--- a/liboctave/system/oct-env.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/system/oct-env.cc Wed Dec 30 12:33:33 2015 -0800 @@ -104,7 +104,7 @@ octave_env::polite_directory_format (const std::string& name) { return (instance_ok ()) - ? instance->do_polite_directory_format (name) : std::string (); + ? instance->do_polite_directory_format (name) : ""; } bool @@ -125,49 +125,49 @@ octave_env::base_pathname (const std::string& s) { return (instance_ok ()) - ? instance->do_base_pathname (s) : std::string (); + ? instance->do_base_pathname (s) : ""; } std::string octave_env::make_absolute (const std::string& s, const std::string& dot_path) { return (instance_ok ()) - ? instance->do_make_absolute (s, dot_path) : std::string (); + ? instance->do_make_absolute (s, dot_path) : ""; } std::string octave_env::get_current_directory () { return (instance_ok ()) - ? instance->do_getcwd () : std::string (); + ? instance->do_getcwd () : ""; } std::string octave_env::get_home_directory () { return (instance_ok ()) - ? instance->do_get_home_directory () : std::string (); + ? instance->do_get_home_directory () : ""; } std::string octave_env::get_temp_directory () { return (instance_ok ()) - ? instance->do_get_temp_directory () : std::string (); + ? instance->do_get_temp_directory () : ""; } std::string octave_env::get_program_name (void) { return (instance_ok ()) - ? instance->prog_name : std::string (); + ? instance->prog_name : ""; } std::string octave_env::get_program_invocation_name (void) { return (instance_ok ()) - ? instance->prog_invocation_name : std::string (); + ? instance->prog_invocation_name : ""; } void @@ -181,14 +181,14 @@ octave_env::get_user_name (void) { return (instance_ok ()) - ? instance->do_get_user_name () : std::string (); + ? instance->do_get_user_name () : ""; } std::string octave_env::get_host_name (void) { return (instance_ok ()) - ? instance->do_get_host_name () : std::string (); + ? instance->do_get_host_name () : ""; } std::string @@ -238,7 +238,7 @@ octave_env::getenv (const std::string& name) { return (instance_ok ()) - ? instance->do_getenv (name) : std::string (); + ? instance->do_getenv (name) : ""; } void
--- a/liboctave/system/oct-group.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/system/oct-group.cc Wed Dec 30 12:33:33 2015 -0800 @@ -84,7 +84,7 @@ octave_group::getgrent (std::string& msg) { #if defined (HAVE_GETGRENT) - msg = std::string (); + msg = ""; return octave_group (::getgrent (), msg); #else msg = NOT_SUPPORTED ("getgrent"); @@ -103,7 +103,7 @@ octave_group::getgrgid (gid_t gid, std::string& msg) { #if defined (HAVE_GETGRGID) - msg = std::string (); + msg = ""; return octave_group (::getgrgid (gid), msg); #else msg = NOT_SUPPORTED ("getgruid"); @@ -122,7 +122,7 @@ octave_group::getgrnam (const std::string& nm, std::string& msg) { #if defined (HAVE_GETGRNAM) - msg = std::string (); + msg = ""; return octave_group (::getgrnam (nm.c_str ()), msg); #else msg = NOT_SUPPORTED ("getgrnam"); @@ -141,7 +141,7 @@ octave_group::setgrent (std::string& msg) { #if defined (HAVE_SETGRENT) - msg = std::string (); + msg = ""; ::setgrent (); return 0; #else @@ -161,7 +161,7 @@ octave_group::endgrent (std::string& msg) { #if defined (HAVE_ENDGRENT) - msg = std::string (); + msg = ""; ::endgrent (); return 0; #else @@ -174,7 +174,7 @@ : gr_name (), gr_passwd (), gr_gid (0), gr_mem (), valid (false) { #if defined (HAVE_GRP_H) - msg = std::string (); + msg = ""; if (p) {
--- a/liboctave/system/oct-passwd.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/system/oct-passwd.cc Wed Dec 30 12:33:33 2015 -0800 @@ -110,7 +110,7 @@ octave_passwd::getpwent (std::string& msg) { #if defined HAVE_GETPWENT - msg = std::string (); + msg = ""; return octave_passwd (::getpwent (), msg); #else msg = NOT_SUPPORTED ("getpwent"); @@ -129,7 +129,7 @@ octave_passwd::getpwuid (uid_t uid, std::string& msg) { #if defined (HAVE_GETPWUID) - msg = std::string (); + msg = ""; return octave_passwd (::getpwuid (uid), msg); #else msg = NOT_SUPPORTED ("getpwuid"); @@ -148,7 +148,7 @@ octave_passwd::getpwnam (const std::string& nm, std::string& msg) { #if defined (HAVE_GETPWNAM) - msg = std::string (); + msg = ""; return octave_passwd (::getpwnam (nm.c_str ()), msg); #else msg = NOT_SUPPORTED ("getpwnam"); @@ -167,7 +167,7 @@ octave_passwd::setpwent (std::string& msg) { #if defined (HAVE_SETPWENT) - msg = std::string (); + msg = ""; ::setpwent (); return 0; #else @@ -187,7 +187,7 @@ octave_passwd::endpwent (std::string& msg) { #if defined (HAVE_ENDPWENT) - msg = std::string (); + msg = ""; ::endpwent (); return 0; #else @@ -201,7 +201,7 @@ pw_dir (), pw_shell (), valid (false) { #if defined (HAVE_PWD_H) - msg = std::string (); + msg = ""; if (p) {
--- a/liboctave/system/oct-syscalls.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/system/oct-syscalls.cc Wed Dec 30 12:33:33 2015 -0800 @@ -57,7 +57,7 @@ int octave_syscalls::dup2 (int old_fd, int new_fd, std::string& msg) { - msg = std::string (); + msg = ""; int status = -1; @@ -84,7 +84,7 @@ octave_syscalls::execvp (const std::string& file, const string_vector& args, std::string& msg) { - msg = std::string (); + msg = ""; int status = -1; @@ -229,7 +229,7 @@ int octave_syscalls::pipe (int *fildes, std::string& msg) { - msg = std::string (); + msg = ""; int status = -1; @@ -257,7 +257,7 @@ std::string& msg) { pid_t retval = -1; - msg = std::string (); + msg = ""; #if defined (HAVE_WAITPID) retval = ::octave_waitpid (pid, status, options); @@ -281,7 +281,7 @@ int octave_syscalls::kill (pid_t pid, int sig, std::string& msg) { - msg = std::string (); + msg = ""; int status = -1; @@ -405,7 +405,7 @@ int octave_fcntl (int fd, int cmd, long arg, std::string& msg) { - msg = std::string (); + msg = ""; int status = -1;
--- a/liboctave/util/cmd-edit.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/util/cmd-edit.cc Wed Dec 30 12:33:33 2015 -0800 @@ -918,7 +918,7 @@ default_command_editor::do_get_current_line (void) const { // FIXME - return std::string (); + return ""; } void @@ -1161,7 +1161,7 @@ command_editor::decode_prompt_string (const std::string& s) { return (instance_ok ()) - ? instance->do_decode_prompt_string (s) : std::string (); + ? instance->do_decode_prompt_string (s) : ""; } int
--- a/liboctave/util/cmd-edit.h Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/util/cmd-edit.h Wed Dec 30 12:33:33 2015 -0800 @@ -159,7 +159,7 @@ static void run_event_hooks (void); - static void read_init_file (const std::string& file = std::string ()); + static void read_init_file (const std::string& file = ""); static void re_read_init_file (void);
--- a/liboctave/util/cmd-hist.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/util/cmd-hist.cc Wed Dec 30 12:33:33 2015 -0800 @@ -564,7 +564,7 @@ command_history::file (void) { return (instance_ok ()) - ? instance->do_file () : std::string (); + ? instance->do_file () : ""; } void @@ -578,7 +578,7 @@ command_history::histcontrol (void) { return (instance_ok ()) - ? instance->do_histcontrol () : std::string (); + ? instance->do_histcontrol () : ""; } void @@ -760,7 +760,7 @@ command_history::get_entry (int n) { return (instance_ok ()) - ? instance->do_get_entry (n) : std::string (); + ? instance->do_get_entry (n) : ""; } void @@ -992,7 +992,7 @@ std::string command_history::do_get_entry (int) const { - return std::string (); + return ""; } void
--- a/liboctave/util/cmd-hist.h Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/util/cmd-hist.h Wed Dec 30 12:33:33 2015 -0800 @@ -99,11 +99,11 @@ static void read_range (const std::string&, int = -1, int = -1, bool = true); - static void write (const std::string& = std::string ()); + static void write (const std::string& = ""); - static void append (const std::string& = std::string ()); + static void append (const std::string& = ""); - static void truncate_file (const std::string& = std::string (), int = -1); + static void truncate_file (const std::string& = "", int = -1); static string_vector list (int = -1, bool = false); @@ -111,7 +111,7 @@ static void replace_entry (int, const std::string&); - static void clean_up_and_save (const std::string& = std::string (), int = -1); + static void clean_up_and_save (const std::string& = "", int = -1); private: @@ -142,7 +142,7 @@ virtual void do_process_histcontrol (const std::string&); - virtual std::string do_histcontrol (void) const { return std::string (); } + virtual std::string do_histcontrol (void) const { return ""; } virtual void do_initialize (bool, const std::string&, int, const std::string&);
--- a/liboctave/util/kpse.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/util/kpse.cc Wed Dec 30 12:33:33 2015 -0800 @@ -616,7 +616,7 @@ if (! READABLE (ret, st)) { /* Failed. */ - ret = std::string (); + ret = ""; } #endif /* ENAMETOOLONG */ @@ -630,7 +630,7 @@ perror (name.c_str ()); } - ret = std::string (); + ret = ""; } return ret; @@ -937,7 +937,7 @@ { string_vector ret_list = search (path, name, must_exist, false); - return ret_list.empty () ? std::string () : ret_list[0]; + return ret_list.empty () ? "" : ret_list[0]; } /* Search all elements of PATH for files named NAME. Not sure if it's @@ -1157,7 +1157,7 @@ { string_vector ret_list = find_first_of (path, names, must_exist, false); - return ret_list.empty () ? std::string () : ret_list[0]; + return ret_list.empty () ? "" : ret_list[0]; } /* Search each element of PATH for each element of NAMES and return a
--- a/liboctave/util/lo-array-gripes.h Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/util/lo-array-gripes.h Wed Dec 30 12:33:33 2015 -0800 @@ -73,7 +73,7 @@ } // Name of variable being indexed. eye(2)(1,1) gives "<unknown>". - void set_var (const std::string& var_arg = std::string ()) + void set_var (const std::string& var_arg = "") { var = var_arg; }
--- a/liboctave/util/pathsearch.cc Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/util/pathsearch.cc Wed Dec 30 12:33:33 2015 -0800 @@ -119,7 +119,7 @@ std::string dir_path::find_first (const std::string& nm) { - return initialized ? kpse_path_search (p, nm, true) : std::string (); + return initialized ? kpse_path_search (p, nm, true) : ""; } string_vector @@ -132,7 +132,7 @@ dir_path::find_first_of (const string_vector& names) { return initialized - ? kpse_path_find_first_of (p, names, true) : std::string (); + ? kpse_path_find_first_of (p, names, true) : ""; } string_vector
--- a/liboctave/util/pathsearch.h Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/util/pathsearch.h Wed Dec 30 12:33:33 2015 -0800 @@ -33,8 +33,8 @@ { public: - dir_path (const std::string& s = std::string (), - const std::string& d = std::string ()) + dir_path (const std::string& s = "", + const std::string& d = "") : p_orig (s), p_default (d), initialized (false), p (), pv () { if (! p_orig.empty ()) @@ -146,7 +146,7 @@ static std::string path_sep_str (void) { - return instance_ok () ? instance->xpath_sep_str : std::string (); + return instance_ok () ? instance->xpath_sep_str : ""; } private:
--- a/liboctave/util/str-vec.h Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/util/str-vec.h Wed Dec 30 12:33:33 2015 -0800 @@ -88,7 +88,7 @@ return longest; } - void resize (octave_idx_type n, const std::string& rfv = std::string ()) + void resize (octave_idx_type n, const std::string& rfv = "") { Array<std::string>::resize (dim_vector (n, 1), rfv); } @@ -107,7 +107,7 @@ string_vector& append (const string_vector& sv); - std::string join (const std::string& sep = std::string ()) const; + std::string join (const std::string& sep = "") const; char **c_str_vec (void) const; @@ -115,7 +115,7 @@ std::ostream& list_in_columns (std::ostream&, int width = 0, - const std::string& prefix = std::string ()) const; + const std::string& prefix = "") const; }; #endif
--- a/liboctave/util/url-transfer.h Wed Dec 30 11:43:29 2015 -0800 +++ b/liboctave/util/url-transfer.h Wed Dec 30 12:33:33 2015 -0800 @@ -127,7 +127,7 @@ time_t& /* filetime */, bool& /* fileisdir */) { } - virtual std::string pwd (void) { return std::string (); } + virtual std::string pwd (void) { return ""; } virtual void http_get (const Array<std::string>& /* param */) { }