Bug#280708: libdebtags: FTBFS with g++-3.4: Template lookup errors -- updated patch

[Karl Chen]

Package: libdebtags
Tags: patch
Followup-For: Bug #280708


Here's an updated patch for libdebtags 0.9.9.

--- debtags/TagDB.cc.orig       2005-07-12 21:34:14.390301802 -0700
+++ debtags/TagDB.cc    2005-07-12 21:35:08.421874204 -0700
@@ -80,7 +80,7 @@
        {
                if (item == "hdparm")
                        printf("%.*s Single no ts: hdparm\n", PFSTR(prefix));
-               consumer->consume(item);
+               this->consumer->consume(item);
        }
        virtual void consume(const std::string& item, const OpSet<std::string>& 
tags) throw ()
        {
@@ -89,13 +89,13 @@
                        string s = fmtts(tags);
                        printf("%.*s Single: hdparm (%.*s)\n", PFSTR(prefix), 
PFSTR(s));
                }
-               consumer->consume(item, tags);
+               this->consumer->consume(item, tags);
        }
        virtual void consume(const OpSet<ITEM>& items) throw ()
        {
                if (items.find("hdparm") != items.end())
                        printf("%.*s Multi no ts: hdparm\n", PFSTR(prefix));
-               consumer->consume(items);
+               this->consumer->consume(items);
        }
        virtual void consume(const OpSet<ITEM>& items, const OpSet<TAG>& tags) 
throw ()
        {
@@ -104,7 +104,7 @@
                        string s = fmtts(tags);
                        printf("%.*s Multi: hdparm (%.*s)\n", PFSTR(prefix), 
PFSTR(s));
                }
-               consumer->consume(items, tags);
+               this->consumer->consume(items, tags);
        }
 };
 };
@@ -275,7 +275,7 @@
 template<class ITEM, class TAG>
 void FacetTagAdder<ITEM, TAG>::consume(const string& item) throw ()
 {
-       consumer->consume(item);
+       this->consumer->consume(item);
 }
 
 template<class ITEM, class TAG>
@@ -291,16 +291,16 @@
        }
 
        if (added.size())
-               consumer->consume(item, tags + added);
+               this->consumer->consume(item, tags + added);
        else
-               consumer->consume(item, tags);
+               this->consumer->consume(item, tags);
 }
 
 // Process a set of items, all with no tags
 template<class ITEM, class TAG>
 void FacetTagAdder<ITEM, TAG>::consume(const OpSet<ITEM>& items) throw ()
 {
-       consumer->consume(items);
+       this->consumer->consume(items);
 }
 
 // Process a set of items identically tagged, with their tags
@@ -317,9 +317,9 @@
        }
 
        if (added.size())
-               consumer->consume(items, tags + added);
+               this->consumer->consume(items, tags + added);
        else
-               consumer->consume(items, tags);
+               this->consumer->consume(items, tags);
 }
 
 

--- debtags/Update.cc.orig      2005-07-12 21:35:32.099620096 -0700
+++ debtags/Update.cc   2005-07-12 21:35:33.448434739 -0700
@@ -71,12 +71,12 @@
 template<class ITEM, class TAG>
 void VocabularyFilter<ITEM, TAG>::consume(const string& item) throw ()
 {
-       consumer->consume(item);
+       this->consumer->consume(item);
 }
 template<class ITEM, class TAG>
 void VocabularyFilter<ITEM, TAG>::consume(const OpSet<ITEM>& items) throw ()
 {
-       consumer->consume(items);
+       this->consumer->consume(items);
 }
 
 
@@ -92,9 +92,9 @@
 //                     fprintf(stderr, "Removing tag %.*s not found in 
vocabulary (package %.*s)\n", PFSTR(*i), PFSTR(item));
 
        if (patched.size())
-               consumer->consume(item, patched);
+               this->consumer->consume(item, patched);
        else
-               consumer->consume(item);
+               this->consumer->consume(item);
 }
 
 // Process a set of items identically tagged, with their tags
@@ -121,9 +121,9 @@
                }
 
        if (patched.size())
-               consumer->consume(items, patched);
+               this->consumer->consume(items, patched);
        else
-               consumer->consume(items);
+               this->consumer->consume(items);
 }
 
 // TagcollFilter that removes items not in the APT database
@@ -145,7 +145,7 @@
 void APTFilter<ITEM, TAG>::consume(const string& item) throw ()
 {
        if (packageDB.hasPackage(item))
-               consumer->consume(item);
+               this->consumer->consume(item);
 //     else
 //             fprintf(stderr, "Removing package %.*s not found in APT 
database\n", PFSTR(item));
 }
@@ -159,7 +159,7 @@
                        filtered += *i;
 //             else
 //                     fprintf(stderr, "Removing package %.*s not found in APT 
database\n", PFSTR(*i));
-       consumer->consume(filtered);
+       this->consumer->consume(filtered);
 }
 
 
@@ -167,7 +167,7 @@
 void APTFilter<ITEM, TAG>::consume(const string& item, const OpSet<string>& 
tags) throw ()
 {
        if (packageDB.hasPackage(item))
-               consumer->consume(item, tags);
+               this->consumer->consume(item, tags);
 //     else
 //             fprintf(stderr, "Removing package %.*s not found in APT 
database\n", PFSTR(item));
 }
@@ -183,7 +183,7 @@
                        filtered += *i;
 //             else
 //                     fprintf(stderr, "Removing package %.*s not found in APT 
database\n", PFSTR(*i));
-       consumer->consume(filtered, tags);
+       this->consumer->consume(filtered, tags);
 }
 
 };



-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.11-perfctr-2.6.13-bmc
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]