Mercurial > octave

changeset 20829:543eca132fa0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation error passing std::string through '...'. * error.cc (Frethrow): Pass tmp_msg.c_str () through rethrow_error() rather than tmp_msg.
author Rik <rik@octave.org>
date Tue, 08 Dec 2015 17:39:27 -0800
parents 7883f240d8ea
children ae0bd73671f3
files libinterp/corefcn/error.cc
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/error.cc	Tue Dec 08 09:55:51 2015 -0800
+++ b/libinterp/corefcn/error.cc	Tue Dec 08 17:39:27 2015 -0800
@@ -951,11 +951,11 @@
           if (len > 1)
             {
               tmp_msg.erase (len - 1);
-              rethrow_error (id.c_str (), "%s\n", tmp_msg);
+              rethrow_error (id.c_str (), "%s\n", tmp_msg.c_str ());
             }
         }
       else
-        rethrow_error (id.c_str (), "%s", tmp_msg);
+        rethrow_error (id.c_str (), "%s", tmp_msg.c_str ());
 
       // FIXME: is this the right thing to do for Vlast_error_stack?
       //        Should it be saved and restored with unwind_protect?