test framework: Correctly generate new paths in noopchroot

[apt.git] / apt-pkg / contrib / progress.h

diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index 3a6943aee5731325a70b1913b3a29aabc0fab76a..427b1bd357fc9496d27293d79506b04077373c80 100644 (file)
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -7,7 +7,7 @@
    
    This class allows lengthy operations to communicate their progress 
    to the GUI. The progress model is simple and is not designed to handle
    
    This class allows lengthy operations to communicate their progress 
    to the GUI. The progress model is simple and is not designed to handle

-   the complex case of the multi-activity aquire class.
+   the complex case of the multi-activity acquire class.

    
    The model is based on the concept of an overall operation consisting
    of a series of small sub operations. Each sub operation has it's own
    
    The model is based on the concept of an overall operation consisting
    of a series of small sub operations. Each sub operation has it's own


@@ -24,6 +24,7 @@
 
 #include <string>
 #include <sys/time.h>
 
 #include <string>
 #include <sys/time.h>

+#include <apt-pkg/macros.h>

 
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;


@@ -74,12 +75,12 @@ class OpTextProgress : public OpProgress
    bool NoUpdate;
    bool NoDisplay;
    unsigned long LastLen;
    bool NoUpdate;
    bool NoDisplay;
    unsigned long LastLen;

-   virtual void Update();
+   virtual void Update() APT_OVERRIDE;

    void Write(const char *S);
    
    public:
 
    void Write(const char *S);
    
    public:
 

-   virtual void Done();
+   virtual void Done() APT_OVERRIDE;

    
    OpTextProgress(bool NoUpdate = false) : NoUpdate(NoUpdate), 
                 NoDisplay(false), LastLen(0) {};
    
    OpTextProgress(bool NoUpdate = false) : NoUpdate(NoUpdate), 
                 NoDisplay(false), LastLen(0) {};