Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h
index 5d1a20e9bb814c765fa92b91908714e5472befe6..d8b4a5c8265b51b839ab8ec015985ed3295cb072 100644 (file)
--- a/apt-pkg/install-progress.h
+++ b/apt-pkg/install-progress.h
@@ -26,9 +26,8 @@ namespace Progress {
     int last_reported_progress;
 
  public:
     int last_reported_progress;
 
  public:

-    PackageManager()
-       : percentage(0.0), last_reported_progress(-1) {};
-    virtual ~PackageManager() {};
+    PackageManager();
+    virtual ~PackageManager();

 
     /* Global Start/Stop */
     virtual void Start(int /*child_pty*/=-1) {};
 
     /* Global Start/Stop */
     virtual void Start(int /*child_pty*/=-1) {};


@@ -120,7 +119,7 @@ namespace Progress {
  class PackageManagerFancy : public PackageManager
  {
  private:
  class PackageManagerFancy : public PackageManager
  {
  private:

-    static void staticSIGWINCH(int);
+    APT_HIDDEN static void staticSIGWINCH(int);

     static std::vector<PackageManagerFancy*> instances;
     APT_HIDDEN bool DrawStatusLine();
 
     static std::vector<PackageManagerFancy*> instances;
     APT_HIDDEN bool DrawStatusLine();