diff options
author | Julian Andres Klode <jak@debian.org> | 2016-09-02 22:38:34 +0200 |
---|---|---|
committer | Julian Andres Klode <jak@debian.org> | 2016-09-02 22:38:34 +0200 |
commit | 969d33307ae0cc1b433a0462ef1561580ea6ddbc (patch) | |
tree | 0322cf6e3a82a1536c4516e8729993ce68af57af /apt-pkg/contrib/sha2.h | |
parent | f6c10fb46d1193b8181b5846538e2cf7c15ff216 (diff) | |
parent | 54dd6baaf16e92c83f63bdb3633df6e603ac19f3 (diff) |
Merge tag '1.3_rc4' into ubuntu/master
apt Debian release 1.3~rc4
Diffstat (limited to 'apt-pkg/contrib/sha2.h')
-rw-r--r-- | apt-pkg/contrib/sha2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/contrib/sha2.h b/apt-pkg/contrib/sha2.h index 8b4bdd439..164840d3b 100644 --- a/apt-pkg/contrib/sha2.h +++ b/apt-pkg/contrib/sha2.h @@ -34,7 +34,7 @@ class SHA2SummationBase : public SummationImplementation protected: bool Done; public: - bool Add(const unsigned char *inbuf, unsigned long long len) APT_OVERRIDE = 0; + bool Add(const unsigned char *inbuf, unsigned long long len) APT_OVERRIDE APT_NONNULL(2) = 0; void Result(); }; @@ -45,7 +45,7 @@ class SHA256Summation : public SHA2SummationBase unsigned char Sum[32]; public: - bool Add(const unsigned char *inbuf, unsigned long long len) APT_OVERRIDE + bool Add(const unsigned char *inbuf, unsigned long long len) APT_OVERRIDE APT_NONNULL(2) { if (Done) return false; @@ -78,7 +78,7 @@ class SHA512Summation : public SHA2SummationBase unsigned char Sum[64]; public: - bool Add(const unsigned char *inbuf, unsigned long long len) APT_OVERRIDE + bool Add(const unsigned char *inbuf, unsigned long long len) APT_OVERRIDE APT_NONNULL(2) { if (Done) return false; |