diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-01 13:57:22 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-01 13:57:22 +0200 |
| commit | 8a1c9010137a8c49d9808f2db34b9ee277138986 (patch) | |
| tree | 5ec5c0103cb896407d8c9542fac0ec8ab3313602 /apt-pkg/contrib/hashes.cc | |
| parent | fa55ccaa85ca8f85251300f5c5f574edc0c3ca71 (diff) | |
| parent | 417e83d0d79637266e04c98189c62ce85bcdf737 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
debian/apt.auto-removal.sh
debian/changelog
vendor/debian/sources.list.in
Diffstat (limited to 'apt-pkg/contrib/hashes.cc')
| -rw-r--r-- | apt-pkg/contrib/hashes.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index 890573d9c..1fce0d75f 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -16,8 +16,12 @@ #include <apt-pkg/hashes.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/configuration.h> -#include <apt-pkg/macros.h> +#include <apt-pkg/md5.h> +#include <apt-pkg/sha1.h> +#include <apt-pkg/sha2.h> +#include <stddef.h> +#include <algorithm> #include <unistd.h> #include <string> #include <iostream> @@ -112,7 +116,7 @@ const char** HashString::SupportedHashes() return _SupportedHashes; } -bool HashString::empty() const +APT_PURE bool HashString::empty() const { return (Type.empty() || Hash.empty()); } |