Hi, lör 2014-06-07 klockan 01:36 +0800 skrev Sphinx Jiang: > Hi, > > > I also tried to fix this bug in some other ways, it turned out I could > not find better solution. I tested your patch on mips64el, amd64 and > i386 ports, all works well. > Thank you for trying the patch. I have updated the patch to NOT Disable the code that uses the private member "apply". All that was needed is to add a "public:" statement to the struct where it is defined. This will keep the same functionality as before. This patch replaces the previous one. Comments welcome!
> > Since there is a patch for the package aptitude, in my opinion quilt > should be added to Build-Depends, it is not included now. > > > > Regards > Sphinx Regards David
Description: gcc 4.9 FTBFS corrections -Werror=unused-function serialize_pattern_list in src/generic/apt/matching/serialize.cc strncase_eq_with_translation in src/main.cc transcode in tests/test_cmdline_download_status_display.cc Unused functions removed. Private member apply in strip_shared_ptrs_result: Apply declared public Author: David Westberg <westberg.da...@bredband.net> Bug-Debian: http://bugs.debian.org/746824 Index: aptitude-0.6.10/src/generic/apt/matching/serialize.cc =================================================================== --- aptitude-0.6.10.orig/src/generic/apt/matching/serialize.cc 2014-06-08 20:17:01.352308339 +0200 +++ aptitude-0.6.10/src/generic/apt/matching/serialize.cc 2014-06-08 20:17:01.348308295 +0200 @@ -94,23 +94,6 @@ out.put(')'); } - void serialize_pattern_list(const std::vector<ref_ptr<pattern> > &patterns, - std::ostream &out, - std::vector<std::string> &variable_name_stack) - { - bool first = true; - for(std::vector<ref_ptr<pattern> >::const_iterator it = - patterns.begin(); it != patterns.end(); ++it) - { - if(first) - first = false; - else - out << ", "; - - serialize_pattern(*it, out, variable_name_stack); - } - } - void serialize_deptype(pkgCache::Dep::DepType deptype, std::ostream &out) { Index: aptitude-0.6.10/src/main.cc =================================================================== --- aptitude-0.6.10.orig/src/main.cc 2014-06-08 20:17:01.352308339 +0200 +++ aptitude-0.6.10/src/main.cc 2014-06-08 20:17:01.348308295 +0200 @@ -359,16 +359,6 @@ namespace { - bool strncase_eq_with_translation(const std::string &s1, const char *s2) - { - if(strcasecmp(s1.c_str(), s2) == 0) - return true; - else if(strcasecmp(s1.c_str(), _(s2)) == 0) - return true; - else - return false; - } - class log_level_map { std::map<std::string, log_level> levels; Index: aptitude-0.6.10/tests/test_cmdline_download_status_display.cc =================================================================== --- aptitude-0.6.10.orig/tests/test_cmdline_download_status_display.cc 2014-06-08 20:17:01.352308339 +0200 +++ aptitude-0.6.10/tests/test_cmdline_download_status_display.cc 2014-06-08 20:17:01.348308295 +0200 @@ -59,11 +59,6 @@ const wchar_t two_column_char = L'-'; // Locally alias transcode to always use UTF-8. - std::wstring transcode(const std::string &s) - { - return cw::util::transcode(s, "UTF-8"); - } - std::string transcode(const std::wstring &s) { return cw::util::transcode(s, "UTF-8"); Index: aptitude-0.6.10/tests/test_parsers.cc =================================================================== --- aptitude-0.6.10.orig/tests/test_parsers.cc 2014-06-08 20:17:01.352308339 +0200 +++ aptitude-0.6.10/tests/test_parsers.cc 2014-06-08 20:37:22.363175620 +0200 @@ -62,6 +62,7 @@ // Used to make it easier to compare results that are vectors. class strip_shared_ptrs_result { +public: template<typename T> struct apply {
