diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-03-09 14:15:47 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-03-09 14:15:47 +0100 |
| commit | 62a7342edb16c38e3d646cc731a4a50ad6657b4f (patch) | |
| tree | f838f2a7e30c5ddf1b3ebb716fca123246c7f71e /python | |
| parent | e5237896629a9fc7ba123b6248eff19d6440cf19 (diff) | |
| download | python-apt-62a7342edb16c38e3d646cc731a4a50ad6657b4f.tar.gz | |
python/generic.cc: use std::string instead of string
Diffstat (limited to 'python')
| -rw-r--r-- | python/generic.cc | 4 | ||||
| -rw-r--r-- | python/progress.cc | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/python/generic.cc b/python/generic.cc index 640f0862..b0770e02 100644 --- a/python/generic.cc +++ b/python/generic.cc @@ -31,11 +31,11 @@ PyObject *HandleErrors(PyObject *Res) Py_DECREF(Res); } - string Err; + std::string Err; int errcnt = 0; while (_error->empty() == false) { - string Msg; + std::string Msg; bool Type = _error->PopMessage(Msg); if (errcnt > 0) Err.append(", "); diff --git a/python/progress.cc b/python/progress.cc index 18081690..097f06cf 100644 --- a/python/progress.cc +++ b/python/progress.cc @@ -491,7 +491,6 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm) StartUpdate(); - PyCbObj_END_ALLOW_THREADS if(PyObject_HasAttrString(callbackInst, "waitChild") || PyObject_HasAttrString(callbackInst, "wait_child")) { |