improve test for #731853 and comments

[apt.git] / apt-pkg / acquire-worker.h

diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h
index 62545829a264d28a9618c5d16c321e05557c5048..848a6bad7d748dd87d012f0ea31a8c45982a44f7 100644 (file)
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@ -79,7 +79,7 @@ class pkgAcquire::Worker : public WeakPointable
     *
     *  \todo Doesn't this duplicate Config->Access?
     */
     *
     *  \todo Doesn't this duplicate Config->Access?
     */

-   string Access;
+   std::string Access;

 
    /** \brief The PID of the subprocess. */
    pid_t Process;
 
    /** \brief The PID of the subprocess. */
    pid_t Process;


@@ -118,13 +118,13 @@ class pkgAcquire::Worker : public WeakPointable
    /** \brief The raw text values of messages received from the
     *  worker, in sequence.
     */
    /** \brief The raw text values of messages received from the
     *  worker, in sequence.
     */

-   vector<string> MessageQueue;
+   std::vector<std::string> MessageQueue;

 
    /** \brief Buffers pending writes to the subprocess.
     *
     *  \todo Wouldn't a std::dequeue be more appropriate?
     */
 
    /** \brief Buffers pending writes to the subprocess.
     *
     *  \todo Wouldn't a std::dequeue be more appropriate?
     */

-   string OutQueue;
+   std::string OutQueue;

    
    /** \brief Common code for the constructor.
     *
    
    /** \brief Common code for the constructor.
     *


@@ -183,7 +183,7 @@ class pkgAcquire::Worker : public WeakPointable
     *
     *  \return \b true.
     */
     *
     *  \return \b true.
     */

-   bool Capabilities(string Message);
+   bool Capabilities(std::string Message);

 
    /** \brief Send a 601 Configuration message (containing the APT
     *  configuration) to the subprocess.
 
    /** \brief Send a 601 Configuration message (containing the APT
     *  configuration) to the subprocess.


@@ -214,7 +214,7 @@ class pkgAcquire::Worker : public WeakPointable
     *  603 Media Changed, with the Failed field set to \b true if the
     *  user cancelled the media change).
     */
     *  603 Media Changed, with the Failed field set to \b true if the
     *  user cancelled the media change).
     */

-   bool MediaChange(string Message);
+   bool MediaChange(std::string Message);

    
    /** \brief Invoked when the worked process dies unexpectedly.
     *
    
    /** \brief Invoked when the worked process dies unexpectedly.
     *


@@ -242,22 +242,22 @@ class pkgAcquire::Worker : public WeakPointable
    /** \brief The most recent status string received from the
     *  subprocess.
     */
    /** \brief The most recent status string received from the
     *  subprocess.
     */

-   string Status;
+   std::string Status;

 
    /** \brief How many bytes of the file have been downloaded.  Zero
     *  if the current progress of the file cannot be determined.
     */
 
    /** \brief How many bytes of the file have been downloaded.  Zero
     *  if the current progress of the file cannot be determined.
     */

-   unsigned long CurrentSize;
+   unsigned long long CurrentSize;

 
    /** \brief The total number of bytes to be downloaded.  Zero if the
     *  total size of the final is unknown.
     */
 
    /** \brief The total number of bytes to be downloaded.  Zero if the
     *  total size of the final is unknown.
     */

-   unsigned long TotalSize;
+   unsigned long long TotalSize;

 
    /** \brief How much of the file was already downloaded prior to
     *  starting this worker.
     */
 
    /** \brief How much of the file was already downloaded prior to
     *  starting this worker.
     */

-   unsigned long ResumePoint;
+   unsigned long long ResumePoint;

    
    /** \brief Tell the subprocess to download the given item.
     *
    
    /** \brief Tell the subprocess to download the given item.
     *