summaryrefslogtreecommitdiff
path: root/python/cdrom.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-11-15 16:55:07 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-11-15 16:55:07 +0100
commit92cc00805d175dc013d544bcee603e8a0c031c2b (patch)
treee33d5d7e7ae3910b67b3193401bf331aa5e80b07 /python/cdrom.cc
parenta0c9ec82095d2e09715e5dc953119ec4fa7b4c2e (diff)
parentfcd268692450231c98bfb6ac2e573ce466e014c7 (diff)
downloadpython-apt-92cc00805d175dc013d544bcee603e8a0c031c2b.tar.gz
merged from lp:~mvo/apt/mvo
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);