diff options
| author | Michael Vogt <egon@tas> | 2006-12-07 12:06:54 +0100 |
|---|---|---|
| committer | Michael Vogt <egon@tas> | 2006-12-07 12:06:54 +0100 |
| commit | 3ca658384917297fdb75112a2b2df26054678934 (patch) | |
| tree | deadcb5d3688dc15ecc95b0c54941191b90ea513 /apt-pkg/contrib | |
| parent | c7d9068f8c352b1ba6b43bd1fffb88542bee19a9 (diff) | |
| parent | 1c05ebd6da9491d316997a98db1451f7b0526603 (diff) | |
merged from apt--mvo
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/progress.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/contrib/sha256.cc | 6 | ||||
| -rw-r--r-- | apt-pkg/contrib/sha256.h | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index cb272e389..e3db9a45a 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -115,6 +115,8 @@ bool OpProgress::CheckChange(float Interval) if ((int)LastPercent == (int)Percent) return false; + + LastPercent = Percent; if (Interval == 0) return false; @@ -126,7 +128,6 @@ bool OpProgress::CheckChange(float Interval) if (Diff < Interval) return false; LastTime = Now; - LastPercent = Percent; return true; } /*}}}*/ diff --git a/apt-pkg/contrib/sha256.cc b/apt-pkg/contrib/sha256.cc index b75ce8a84..ecda3d8e8 100644 --- a/apt-pkg/contrib/sha256.cc +++ b/apt-pkg/contrib/sha256.cc @@ -18,6 +18,12 @@ * any later version. * */ + +#ifdef __GNUG__ +#pragma implementation "apt-pkg/sha256.h" +#endif + + #define SHA256_DIGEST_SIZE 32 #define SHA256_HMAC_BLOCK_SIZE 64 diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h index 9e88f5ece..70b3ae2ad 100644 --- a/apt-pkg/contrib/sha256.h +++ b/apt-pkg/contrib/sha256.h @@ -20,7 +20,6 @@ #include <string> #include <algorithm> -#include <stdint.h> using std::string; using std::min; |