Make private sha2 functions static

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

diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index 20caf4cdf6321c951ee57fb20c9f281c4f4e9acb..3a914d17f6aca935059a30a56834875b85d745ea 100644 (file)
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -21,9 +21,6 @@
 #ifndef PKGLIB_PROGRESS_H
 #define PKGLIB_PROGRESS_H
 
 #ifndef PKGLIB_PROGRESS_H
 #define PKGLIB_PROGRESS_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/progress.h"
-#endif 

 
 #include <string>
 #include <sys/time.h>
 
 #include <string>
 #include <sys/time.h>


@@ -58,8 +55,7 @@ class OpProgress
    public:
    
    void Progress(unsigned long Current);
    public:
    
    void Progress(unsigned long Current);

-   void SubProgress(unsigned long SubTotal);
-   void SubProgress(unsigned long SubTotal,const string &Op);
+   void SubProgress(unsigned long SubTotal, const string &Op = "", float const Percent = -1);

    void OverallProgress(unsigned long Current,unsigned long Total,
                        unsigned long Size,const string &Op);
    virtual void Done() {};
    void OverallProgress(unsigned long Current,unsigned long Total,
                        unsigned long Size,const string &Op);
    virtual void Done() {};