summaryrefslogtreecommitdiff
path: root/python/cdrom.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-12-08 18:08:06 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-12-08 18:08:06 +0100
commit2b0f6ff05d2c6937c1160c497cfb76b43f11f2db (patch)
treea87e2639df12481e2046b835996628b53ec6325c /python/cdrom.cc
parentb0995cca556668a4eced03e40e3edbc7362c2a10 (diff)
parent350bb4a03d6562ddba12fbb0a34610aac7706b3c (diff)
downloadpython-apt-2b0f6ff05d2c6937c1160c497cfb76b43f11f2db.tar.gz
merged from the mvo branch
Diffstat (limited to 'python/cdrom.cc')
-rw-r--r--python/cdrom.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/cdrom.cc b/python/cdrom.cc
index 6ac16d59..46bb769c 100644
--- a/python/cdrom.cc
+++ b/python/cdrom.cc
@@ -67,7 +67,7 @@ static PyObject *cdrom_ident(PyObject *Self,PyObject *Args)
PyCdromProgress progress;
progress.setCallbackInst(pyCdromProgressInst);
- string ident;
+ std::string ident;
bool res = Cdrom.Ident(ident, &progress);
if (res)
@@ -94,7 +94,7 @@ static PyObject *cdrom_ident_old(PyObject *Self,PyObject *Args)
PyCdromProgress progress;
progress.setCallbackInst(pyCdromProgressInst);
- string ident;
+ std::string ident;
bool res = Cdrom.Ident(ident, &progress);
PyObject *boolres = PyBool_FromLong(res);