[Debtags-commits] [svn] r982 - in libdebtags1/trunk: . debian debtags
Enrico Zini
debtags-commits@lists.alioth.debian.org
Sat, 09 Jul 2005 21:57:44 +0000
Author: enrico
Date: Sat Jul 9 21:57:42 2005
New Revision: 982
Modified:
libdebtags1/trunk/ (props changed)
libdebtags1/trunk/README
libdebtags1/trunk/debian/changelog
libdebtags1/trunk/debian/control
libdebtags1/trunk/debtags/BasicPackageMatcher.cc
libdebtags1/trunk/debtags/BasicPackageMatcher.h
libdebtags1/trunk/debtags/BasicTagMatcher.cc
libdebtags1/trunk/debtags/BasicTagMatcher.h
libdebtags1/trunk/debtags/Consumer.h
libdebtags1/trunk/debtags/DebtagsFilters.cc
libdebtags1/trunk/debtags/DebtagsFilters.h
libdebtags1/trunk/debtags/DebtagsSerializer.cc
libdebtags1/trunk/debtags/DebtagsSerializer.h
libdebtags1/trunk/debtags/DebtagsSimple.cc
libdebtags1/trunk/debtags/DebtagsSimple.h
libdebtags1/trunk/debtags/DebtagsStatus.cc
libdebtags1/trunk/debtags/DebtagsStatus.h
libdebtags1/trunk/debtags/DebtagsTODO.cc
libdebtags1/trunk/debtags/DebtagsTODO.h
libdebtags1/trunk/debtags/DebtagsUtils.cc
libdebtags1/trunk/debtags/DebtagsUtils.h
libdebtags1/trunk/debtags/Package.cc
libdebtags1/trunk/debtags/Package.h
libdebtags1/trunk/debtags/PackageImpl.cc
libdebtags1/trunk/debtags/PackageImpl.h
libdebtags1/trunk/debtags/PackageSet.cc
libdebtags1/trunk/debtags/PackageSet.h
libdebtags1/trunk/debtags/Paths.cc
libdebtags1/trunk/debtags/Paths.h
libdebtags1/trunk/debtags/Tag.cc
libdebtags1/trunk/debtags/Tag.h
libdebtags1/trunk/debtags/TagDB.cc
libdebtags1/trunk/debtags/TagDB.h
libdebtags1/trunk/debtags/TagImpl.cc
libdebtags1/trunk/debtags/TagImpl.h
libdebtags1/trunk/debtags/TagSet.cc
libdebtags1/trunk/debtags/TagSet.h
libdebtags1/trunk/debtags/Update.cc
libdebtags1/trunk/debtags/Update.h
libdebtags1/trunk/debtags/Vocabulary.cc
libdebtags1/trunk/debtags/Vocabulary.h
Log:
r4005@viaza: enrico | 2005-07-10 00:45:58 +0300
Prepared release of 1.0.6 with transition to gcc4
Modified: libdebtags1/trunk/README
==============================================================================
--- libdebtags1/trunk/README (original)
+++ libdebtags1/trunk/README Sat Jul 9 21:57:42 2005
@@ -1,5 +1,5 @@
-README for libdebtags1 1.0.6, still unreleased
-==============================================
+README for libdebtags1 1.0.6
+============================
Functionality
-------------
@@ -121,6 +121,11 @@
* Done in version 1.0.5
+ + Transition to gcc4
+
+
+ * Done in version 1.0.5
+
+ Removed some segfault in Debtags::Package operations
Modified: libdebtags1/trunk/debian/changelog
==============================================================================
--- libdebtags1/trunk/debian/changelog (original)
+++ libdebtags1/trunk/debian/changelog Sat Jul 9 21:57:42 2005
@@ -1,3 +1,9 @@
+libdebtags1 (1.0.6) unstable; urgency=low
+
+ * Compiles with gcc 4
+
+ -- Enrico Zini <enrico@debian.org> Sun, 10 Jul 2005 00:44:47 +0300
+
libdebtags1 (1.0.5) unstable; urgency=low
* Fixed a segfault in Debtags::Package code
Modified: libdebtags1/trunk/debian/control
==============================================================================
--- libdebtags1/trunk/debian/control (original)
+++ libdebtags1/trunk/debian/control Sat Jul 9 21:57:42 2005
@@ -2,7 +2,7 @@
Priority: optional
Section: libdevel
Maintainer: Enrico Zini <enrico@debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1), dh-buildinfo, pkg-config, zlib1g-dev, libtagcoll1-dev (>= 1.0.1), libtagcoll1-dev (<< 1.1), libtagcoll1-pic (>= 1.0.1), libtagcoll1-pic (<< 1.1), libapt-pkg-dev, doxygen, graphviz, swig, python-dev
+Build-Depends: cdbs, debhelper (>= 4.1), dh-buildinfo, pkg-config, zlib1g-dev, libtagcoll1-dev (>= 1.0.5), libtagcoll1-dev (<< 1.1), libtagcoll1-pic (>= 1.0.5), libtagcoll1-pic (<< 1.1), libapt-pkg-dev, doxygen, graphviz, swig, python-dev
Standards-Version: 3.6.2.0
Package: libdebtags1-dev
Modified: libdebtags1/trunk/debtags/BasicPackageMatcher.cc
==============================================================================
--- libdebtags1/trunk/debtags/BasicPackageMatcher.cc (original)
+++ libdebtags1/trunk/debtags/BasicPackageMatcher.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
#include <debtags/BasicPackageMatcher.h>
#include <debtags/Package.h>
@@ -143,7 +141,7 @@
void BasicPackageMatcher<ITEM>::consume(const ITEM& item, const OpSet<Tag>& tags) throw ()
{
if (match(item, tags))
- consumer->consume(item, tags);
+ this->consumer->consume(item, tags);
}
Modified: libdebtags1/trunk/debtags/BasicPackageMatcher.h
==============================================================================
--- libdebtags1/trunk/debtags/BasicPackageMatcher.h (original)
+++ libdebtags1/trunk/debtags/BasicPackageMatcher.h Sat Jul 9 21:57:42 2005
@@ -1,8 +1,6 @@
#ifndef DEBTAGS_BASIC_PACKAGE_MATCHER_H
#define DEBTAGS_BASIC_PACKAGE_MATCHER_H
-#pragma interface
-
#include <string>
#include <debtags/Tag.h>
#include <debtags/TagSet.h>
Modified: libdebtags1/trunk/debtags/BasicTagMatcher.cc
==============================================================================
--- libdebtags1/trunk/debtags/BasicTagMatcher.cc (original)
+++ libdebtags1/trunk/debtags/BasicTagMatcher.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
#include <debtags/BasicTagMatcher.h>
#include <debtags/Tag.h>
Modified: libdebtags1/trunk/debtags/BasicTagMatcher.h
==============================================================================
--- libdebtags1/trunk/debtags/BasicTagMatcher.h (original)
+++ libdebtags1/trunk/debtags/BasicTagMatcher.h Sat Jul 9 21:57:42 2005
@@ -1,8 +1,6 @@
#ifndef DEBTAGS_BASIC_TAG_FILTER_H
#define DEBTAGS_BASIC_TAG_FILTER_H
-#pragma interface
-
#include <debtags/Consumer.h>
#include <string>
Modified: libdebtags1/trunk/debtags/Consumer.h
==============================================================================
--- libdebtags1/trunk/debtags/Consumer.h (original)
+++ libdebtags1/trunk/debtags/Consumer.h Sat Jul 9 21:57:42 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-//#pragma interface
-
#include <string>
namespace Debtags
@@ -33,6 +31,9 @@
class Consumer
{
public:
+ Consumer() {}
+ virtual ~Consumer() {}
+
virtual void consume(const ITEM&) throw () = 0;
};
@@ -40,6 +41,9 @@
class Matcher
{
public:
+ Matcher() {}
+ virtual ~Matcher() {}
+
virtual bool match(const ITEM& item) const throw ()
{
return true;
@@ -53,6 +57,7 @@
Consumer<ITEM>& next;
public:
Filter<ITEM>(Consumer<ITEM>& next) throw () : next(next) {}
+ virtual ~Filter<ITEM>() {}
virtual void consume(const ITEM& item) throw ()
{
@@ -69,11 +74,12 @@
public:
MatcherFilter<ITEM>(Matcher<ITEM>& matcher, Consumer<ITEM>& next) throw ()
: Filter<ITEM>(next), matcher(matcher) {}
+ virtual ~MatcherFilter() {}
virtual void consume(const ITEM& item) throw ()
{
if (matcher.match(item))
- next.consume(item);
+ this->next.consume(item);
}
};
Modified: libdebtags1/trunk/debtags/DebtagsFilters.cc
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsFilters.cc (original)
+++ libdebtags1/trunk/debtags/DebtagsFilters.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
#include "config.h"
#include <debtags/DebtagsFilters.h>
@@ -41,25 +39,25 @@
void ExpressionFilter<ITEM>::consume(const ITEM& item) throw ()
{
if (expr->eval(Tagcoll::OpSet<string>()))
- consumer->consume(item);
+ this->consumer->consume(item);
}
template<class ITEM>
void ExpressionFilter<ITEM>::consume(const ITEM& item, const Tagcoll::OpSet<Tag>& tags) throw ()
{
if (expr->eval(ser.tagsToStrings(tags)))
- consumer->consume(item, tags);
+ this->consumer->consume(item, tags);
}
template<class ITEM>
void ExpressionFilter<ITEM>::consume(const Tagcoll::OpSet<ITEM>& items) throw ()
{
if (expr->eval(Tagcoll::OpSet<string>()))
- consumer->consume(items);
+ this->consumer->consume(items);
}
template<class ITEM>
void ExpressionFilter<ITEM>::consume(const Tagcoll::OpSet<ITEM>& items, const Tagcoll::OpSet<Debtags::Tag>& tags) throw ()
{
if (expr->eval(ser.tagsToStrings(tags)))
- consumer->consume(items, tags);
+ this->consumer->consume(items, tags);
}
@@ -79,7 +77,7 @@
void UntaggedFilter<ITEM>::consume(const ITEM& item) throw ()
{
if (!inverse)
- consumer->consume(item);
+ this->consumer->consume(item);
}
template<class ITEM>
void UntaggedFilter<ITEM>::consume(const ITEM& item, const Tagcoll::OpSet<Tag>& tags) throw ()
@@ -88,13 +86,13 @@
consume(item);
else
if (inverse)
- consumer->consume(item, tags);
+ this->consumer->consume(item, tags);
}
template<class ITEM>
void UntaggedFilter<ITEM>::consume(const Tagcoll::OpSet<ITEM>& items) throw ()
{
if (!inverse)
- consumer->consume(items);
+ this->consumer->consume(items);
}
template<class ITEM>
void UntaggedFilter<ITEM>::consume(const Tagcoll::OpSet<ITEM>& items, const Tagcoll::OpSet<Debtags::Tag>& tags) throw ()
@@ -103,7 +101,7 @@
consume(items);
else
if (inverse)
- consumer->consume(items, tags);
+ this->consumer->consume(items, tags);
}
// vim:set ts=4 sw=4:
Modified: libdebtags1/trunk/debtags/DebtagsFilters.h
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsFilters.h (original)
+++ libdebtags1/trunk/debtags/DebtagsFilters.h Sat Jul 9 21:57:42 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <tagcoll/Exception.h>
#include <tagcoll/TagcollFilter.h>
#include <debtags/DebtagsSerializer.h>
Modified: libdebtags1/trunk/debtags/DebtagsSerializer.cc
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsSerializer.cc (original)
+++ libdebtags1/trunk/debtags/DebtagsSerializer.cc Sat Jul 9 21:57:42 2005
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma implementation
-
#include <debtags/DebtagsSerializer.h>
#include <debtags/Vocabulary.h>
#include <debtags/Tag.h>
Modified: libdebtags1/trunk/debtags/DebtagsSerializer.h
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsSerializer.h (original)
+++ libdebtags1/trunk/debtags/DebtagsSerializer.h Sat Jul 9 21:57:42 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <debtags/PackageDB.h>
#include <tagcoll/Exception.h>
Modified: libdebtags1/trunk/debtags/DebtagsSimple.cc
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsSimple.cc (original)
+++ libdebtags1/trunk/debtags/DebtagsSimple.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
#include "config.h"
#include <debtags/DebtagsSimple.h>
Modified: libdebtags1/trunk/debtags/DebtagsSimple.h
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsSimple.h (original)
+++ libdebtags1/trunk/debtags/DebtagsSimple.h Sat Jul 9 21:57:42 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <debtags/Vocabulary.h>
#include <debtags/TagDB.h>
#include <tagcoll/Implications.h>
Modified: libdebtags1/trunk/debtags/DebtagsStatus.cc
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsStatus.cc (original)
+++ libdebtags1/trunk/debtags/DebtagsStatus.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
#include "config.h"
#include <debtags/DebtagsStatus.h>
Modified: libdebtags1/trunk/debtags/DebtagsStatus.h
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsStatus.h (original)
+++ libdebtags1/trunk/debtags/DebtagsStatus.h Sat Jul 9 21:57:42 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <string>
namespace Debtags
Modified: libdebtags1/trunk/debtags/DebtagsTODO.cc
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsTODO.cc (original)
+++ libdebtags1/trunk/debtags/DebtagsTODO.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
#include "config.h"
#include <debtags/DebtagsTODO.h>
Modified: libdebtags1/trunk/debtags/DebtagsTODO.h
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsTODO.h (original)
+++ libdebtags1/trunk/debtags/DebtagsTODO.h Sat Jul 9 21:57:42 2005
@@ -22,8 +22,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <debtags/Package.h>
#include <debtags/PackageSet.h>
#include <debtags/Tag.h>
Modified: libdebtags1/trunk/debtags/DebtagsUtils.cc
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsUtils.cc (original)
+++ libdebtags1/trunk/debtags/DebtagsUtils.cc Sat Jul 9 21:57:42 2005
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <debtags/DebtagsUtils.h>
using namespace Debtags;
Modified: libdebtags1/trunk/debtags/DebtagsUtils.h
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsUtils.h (original)
+++ libdebtags1/trunk/debtags/DebtagsUtils.h Sat Jul 9 21:57:42 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <debtags/DebtagsSimple.h>
#include <string>
#include <map>
Modified: libdebtags1/trunk/debtags/Package.cc
==============================================================================
--- libdebtags1/trunk/debtags/Package.cc (original)
+++ libdebtags1/trunk/debtags/Package.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
#include <debtags/Package.h>
#include <debtags/PackageImpl.h>
#include <debtags/TagDB.h>
Modified: libdebtags1/trunk/debtags/Package.h
==============================================================================
--- libdebtags1/trunk/debtags/Package.h (original)
+++ libdebtags1/trunk/debtags/Package.h Sat Jul 9 21:57:42 2005
@@ -1,8 +1,6 @@
#ifndef DEBTAGS_PACKAGE_H
#define DEBTAGS_PACKAGE_H
-#pragma interface
-
#include "PackageDB.h"
#include <string>
Modified: libdebtags1/trunk/debtags/PackageImpl.cc
==============================================================================
--- libdebtags1/trunk/debtags/PackageImpl.cc (original)
+++ libdebtags1/trunk/debtags/PackageImpl.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
#include <debtags/PackageImpl.h>
#include <debtags/PackageDB.h>
#include <debtags/PackageDBImpl.h>
Modified: libdebtags1/trunk/debtags/PackageImpl.h
==============================================================================
--- libdebtags1/trunk/debtags/PackageImpl.h (original)
+++ libdebtags1/trunk/debtags/PackageImpl.h Sat Jul 9 21:57:42 2005
@@ -1,8 +1,6 @@
#ifndef DEBTAG_PACKAGE_IMPL_H
#define DEBTAG_PACKAGE_IMPL_H
-#pragma interface
-
#if 0
#include <debtags/Package.h>
#include <debtags/Environment.h>
Modified: libdebtags1/trunk/debtags/PackageSet.cc
==============================================================================
--- libdebtags1/trunk/debtags/PackageSet.cc (original)
+++ libdebtags1/trunk/debtags/PackageSet.cc Sat Jul 9 21:57:42 2005
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma implementation
-
#include <debtags/PackageSet.h>
#include <debtags/TagSet.h>
Modified: libdebtags1/trunk/debtags/PackageSet.h
==============================================================================
--- libdebtags1/trunk/debtags/PackageSet.h (original)
+++ libdebtags1/trunk/debtags/PackageSet.h Sat Jul 9 21:57:42 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <debtags/Package.h>
#include <debtags/Consumer.h>
Modified: libdebtags1/trunk/debtags/Paths.cc
==============================================================================
--- libdebtags1/trunk/debtags/Paths.cc (original)
+++ libdebtags1/trunk/debtags/Paths.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
/*
* libdebtags paths
*
Modified: libdebtags1/trunk/debtags/Paths.h
==============================================================================
--- libdebtags1/trunk/debtags/Paths.h (original)
+++ libdebtags1/trunk/debtags/Paths.h Sat Jul 9 21:57:42 2005
@@ -1,8 +1,6 @@
#ifndef DEBTAGS_PATHS_H
#define DEBTAGS_PATHS_H
-#pragma interface
-
/*
* libdebtags paths
*
Modified: libdebtags1/trunk/debtags/Tag.cc
==============================================================================
--- libdebtags1/trunk/debtags/Tag.cc (original)
+++ libdebtags1/trunk/debtags/Tag.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
#include <debtags/Tag.h>
#include <debtags/TagImpl.h>
#include <debtags/TagSet.h>
Modified: libdebtags1/trunk/debtags/Tag.h
==============================================================================
--- libdebtags1/trunk/debtags/Tag.h (original)
+++ libdebtags1/trunk/debtags/Tag.h Sat Jul 9 21:57:42 2005
@@ -1,8 +1,6 @@
#ifndef DEBTAGS_TAG_H
#define DEBTAGS_TAG_H
-#pragma interface
-
#include <string>
namespace Debtags
Modified: libdebtags1/trunk/debtags/TagDB.cc
==============================================================================
--- libdebtags1/trunk/debtags/TagDB.cc (original)
+++ libdebtags1/trunk/debtags/TagDB.cc Sat Jul 9 21:57:42 2005
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma implementation
-
#include <debtags/TagDB.h>
#include <debtags/Paths.h>
#include <debtags/Vocabulary.h>
@@ -172,7 +170,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>
@@ -188,16 +186,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
@@ -214,9 +212,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);
}
@@ -234,7 +232,7 @@
if (access(patchFile.c_str(), F_OK) == 0)
{
StdioParserInput in(patchFile);
- PatchList<ITEM, Tag> patch = TextFormat<ITEM, Tag>::parsePatch(in, serializer);
+ PatchList<ITEM, Tag> patch = TextFormat<ITEM, Tag>::parsePatch(in, this->serializer);
setChanges(patch);
}
}
@@ -267,7 +265,7 @@
void TagDB<ITEM>::savePatch()
throw (FileException, ParserException, SystemException)
{
- savePatch(getChanges());
+ savePatch(this->getChanges());
}
template<class ITEM>
@@ -286,7 +284,7 @@
if (out == 0)
throw SystemException(errno, "Can't write to " + patchFile);
- TextFormat<ITEM, Tag>::outputPatch(patch, serializer, out);
+ TextFormat<ITEM, Tag>::outputPatch(patch, this->serializer, out);
fclose(out);
} catch (Exception& e) {
@@ -300,9 +298,9 @@
void TagDB<ITEM>::sendPatch()
throw (FileException, ParserException, SystemException, ConsistencyCheckException)
{
- PatchList<ITEM, Tag> patch = getChanges();
+ PatchList<ITEM, Tag> patch = this->getChanges();
if (!patch.empty())
- sendPatch(getChanges());
+ sendPatch(this->getChanges());
}
template<class ITEM>
@@ -330,7 +328,7 @@
"Content-Disposition: inline\n\n"
"-- DEBTAGS DIFF V0.1 --\n", udata->pw_name);
- TextFormat<ITEM, Tag>::outputPatch(patch, serializer, out);
+ TextFormat<ITEM, Tag>::outputPatch(patch, this->serializer, out);
fprintf(out, "\n--9amGYk9869ThD9tj\n");
@@ -436,7 +434,7 @@
void TagDB<ITEM>::outputSystem(TagcollConsumer<ITEM, Tag>& cons)
{
StdioParserInput in(Paths::path_tagdb);
- TextFormat<ITEM, Tag>::parse(in, serializer, cons);
+ TextFormat<ITEM, Tag>::parse(in, this->serializer, cons);
}
#if 0
@@ -557,12 +555,12 @@
if (access(patchFile.c_str(), F_OK) == 0)
{
StdioParserInput inpatch(patchFile);
- PatchList<ITEM, Tag> patch = TextFormat<ITEM, Tag>::parsePatch(inpatch, serializer);
+ PatchList<ITEM, Tag> patch = TextFormat<ITEM, Tag>::parsePatch(inpatch, this->serializer);
patch.setConsumer(&cons);
StdioParserInput in(Paths::path_tagdb);
- TextFormat<ITEM, Tag>::parse(in, serializer, patch);
+ TextFormat<ITEM, Tag>::parse(in, this->serializer, patch);
} else
outputSystem(cons);
}
Modified: libdebtags1/trunk/debtags/TagDB.h
==============================================================================
--- libdebtags1/trunk/debtags/TagDB.h (original)
+++ libdebtags1/trunk/debtags/TagDB.h Sat Jul 9 21:57:42 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <tagcoll/Exception.h>
#include <tagcoll/ParserBase.h>
#include <tagcoll/TagcollConsumer.h>
Modified: libdebtags1/trunk/debtags/TagImpl.cc
==============================================================================
--- libdebtags1/trunk/debtags/TagImpl.cc (original)
+++ libdebtags1/trunk/debtags/TagImpl.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
#include <debtags/TagImpl.h>
#include <debtags/TagSet.h>
#include <debtags/Vocabulary.h>
Modified: libdebtags1/trunk/debtags/TagImpl.h
==============================================================================
--- libdebtags1/trunk/debtags/TagImpl.h (original)
+++ libdebtags1/trunk/debtags/TagImpl.h Sat Jul 9 21:57:42 2005
@@ -1,8 +1,6 @@
#ifndef DEBTAGS_TAG_IMPL_H
#define DEBTAGS_TAG_IMPL_H
-#pragma interface
-
/*
* Tag vocabulary access
*
Modified: libdebtags1/trunk/debtags/TagSet.cc
==============================================================================
--- libdebtags1/trunk/debtags/TagSet.cc (original)
+++ libdebtags1/trunk/debtags/TagSet.cc Sat Jul 9 21:57:42 2005
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma implementation
-
#include <debtags/TagSet.h>
#include <debtags/Consumer.h>
Modified: libdebtags1/trunk/debtags/TagSet.h
==============================================================================
--- libdebtags1/trunk/debtags/TagSet.h (original)
+++ libdebtags1/trunk/debtags/TagSet.h Sat Jul 9 21:57:42 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <debtags/Tag.h>
#include <tagcoll/OpSet.h>
Modified: libdebtags1/trunk/debtags/Update.cc
==============================================================================
--- libdebtags1/trunk/debtags/Update.cc (original)
+++ libdebtags1/trunk/debtags/Update.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
#include "config.h"
#include <debtags/Update.h>
Modified: libdebtags1/trunk/debtags/Update.h
==============================================================================
--- libdebtags1/trunk/debtags/Update.h (original)
+++ libdebtags1/trunk/debtags/Update.h Sat Jul 9 21:57:42 2005
@@ -1,8 +1,6 @@
#ifndef DEBTAGS_UPDATE_H
#define DEBTAGS_UPDATE_H
-#pragma interface
-
#include <tagcoll/Exception.h>
#include <tagcoll/ParserBase.h>
Modified: libdebtags1/trunk/debtags/Vocabulary.cc
==============================================================================
--- libdebtags1/trunk/debtags/Vocabulary.cc (original)
+++ libdebtags1/trunk/debtags/Vocabulary.cc Sat Jul 9 21:57:42 2005
@@ -1,5 +1,3 @@
-#pragma implementation
-
/*
* Tag vocabulary access
*
Modified: libdebtags1/trunk/debtags/Vocabulary.h
==============================================================================
--- libdebtags1/trunk/debtags/Vocabulary.h (original)
+++ libdebtags1/trunk/debtags/Vocabulary.h Sat Jul 9 21:57:42 2005
@@ -1,8 +1,6 @@
#ifndef VOCABULARY_H
#define VOCABULARY_H
-#pragma interface
-
/*
* Tag vocabulary access
*