diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2012-05-12 00:11:07 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-05-12 00:11:07 +0200 |
| commit | 606837654922b8c58c9ac8a12b44c30f308115e3 (patch) | |
| tree | cdb56924401c0543955d58926df1195fd3982a19 | |
| parent | aa2218b25cb29e8c0677f0f3ede098583c7ae49f (diff) | |
| download | apt-606837654922b8c58c9ac8a12b44c30f308115e3.tar.gz | |
* apt-pkg/pkgcachegen.cc:
- make IsDuplicatedDescription static so that it is really private
as we don't need a symbol for it as it is not in a header
| -rw-r--r-- | apt-pkg/pkgcachegen.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/libapt-pkg4.12.symbols | 1 |
3 files changed, 11 insertions, 3 deletions
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index d455e4070..538d10b35 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -38,7 +38,7 @@ typedef std::vector<pkgIndexFile *>::iterator FileIterator; template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap; -bool IsDuplicateDescription(pkgCache::DescIterator Desc, +static bool IsDuplicateDescription(pkgCache::DescIterator Desc, MD5SumValue const &CurMd5, std::string const &CurLang); using std::string; @@ -1455,7 +1455,7 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O } /*}}}*/ // IsDuplicateDescription /*{{{*/ -bool IsDuplicateDescription(pkgCache::DescIterator Desc, +static bool IsDuplicateDescription(pkgCache::DescIterator Desc, MD5SumValue const &CurMd5, std::string const &CurLang) { // Descriptions in the same link-list have all the same md5 diff --git a/debian/changelog b/debian/changelog index ba660b726..af63bec4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.9.4) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/pkgcachegen.cc: + - make IsDuplicatedDescription static so that it is really private + as we don't need a symbol for it as it is not in a header + + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 + apt (0.9.3) unstable; urgency=low [ David Kalnischkies ] diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index 1abf22899..bf42e8b10 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -1530,4 +1530,3 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=private)"pkgCacheGenerator::MergeListVersion(pkgCacheGenerator::ListParser&, pkgCache::PkgIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, pkgCache::VerIterator*&)@Base" 0.8.16~exp7 (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator&, pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.16~exp7 (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator&, pkgCache::PkgIterator&)@Base" 0.8.16~exp7 - (c++|optional=internal)"IsDuplicateDescription(pkgCache::DescIterator, HashSumValue<128> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp7 |