[pypy-commit] pypy default: merge heads

[rlamy]

Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: 
Changeset: r89651:b34a338909b6
Date: 2017-01-18 02:19 +0000
http://bitbucket.org/pypy/pypy/changeset/b34a338909b6/

Log:    merge heads

diff --git a/pypy/module/cppyy/src/clingcwrapper.cxx 
b/pypy/module/cppyy/src/clingcwrapper.cxx
--- a/pypy/module/cppyy/src/clingcwrapper.cxx
+++ b/pypy/module/cppyy/src/clingcwrapper.cxx
@@ -522,7 +522,7 @@
    if ( FastCall( method, args, self, (void*)cppresult ) ) {
          cstr = cppstring_to_cstring( *cppresult );
       *length = cppresult->size();
-      cppresult->std::string::~string();
+      cppresult->std::string::~basic_string();
    } else
       *length = 0;
    free( (void*)cppresult ); 
@@ -712,7 +712,7 @@
          msg << "failed offset calculation between " << cb->GetName() << " and 
" << cd->GetName();
          // TODO: propagate this warning to caller w/o use of Python C-API
          // PyErr_Warn( PyExc_RuntimeWarning, const_cast<char*>( 
msg.str().c_str() ) );
-         std::cerr << "Warning: " << msg << '\n';
+         std::cerr << "Warning: " << msg.str() << '\n';
       }
 
    // return -1 to signal caller NOT to apply offset
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit