From 6d518e5b49c60ce1e0a3ecea3f640ec670166928 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Tue, 30 Sep 2003 20:12:39 +0000 Subject: [PATCH] renamed 'PACKAGE' class to 'Package' to avoid naming-clashes with the standard autoconf macro git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@17 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/src/vutil.h | 22 +++++++++++----------- util-vserver/src/vutil.p | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/util-vserver/src/vutil.h b/util-vserver/src/vutil.h index d334df3..ae00f4b 100644 --- a/util-vserver/src/vutil.h +++ b/util-vserver/src/vutil.h @@ -47,23 +47,23 @@ extern const char K_DUMPFILES[]; extern const char K_UNIFILES[]; extern const char K_PKGVERSION[]; -class PACKAGE{ +class Package{ public: string name; string version; // version + release - PACKAGE(string &_name, string &_version) + Package(string &_name, string &_version) : name (_name), version(_version) { } - PACKAGE(const char *_name, const char *_version) + Package(const char *_name, const char *_version) : name (_name), version(_version) { } - PACKAGE(const string &line) + Package(const string &line) { *this = line; } - PACKAGE & operator = (const string &_line) + Package & operator = (const string &_line) { string line (_line); string::iterator pos = find (line.begin(),line.end(),'='); @@ -73,16 +73,16 @@ public: } return *this; } - PACKAGE (const PACKAGE &pkg) + Package (const Package &pkg) { name = pkg.name; version = pkg.version; } - bool operator == (const PACKAGE &v) const + bool operator == (const Package &v) const { return name == v.name && version == v.version; } - bool operator < (const PACKAGE &v) const + bool operator < (const Package &v) const { bool ret = false; if (name < v.name){ @@ -118,10 +118,10 @@ public: // Check if two package have the same name (but potentially different version) class same_name{ - const PACKAGE &pkg; + const Package &pkg; public: - same_name(const PACKAGE &_pkg) : pkg(_pkg) {} - bool operator()(const PACKAGE &p) + same_name(const Package &_pkg) : pkg(_pkg) {} + bool operator()(const Package &p) { return pkg.name == p.name; } diff --git a/util-vserver/src/vutil.p b/util-vserver/src/vutil.p index ada13e2..d9663d5 100644 --- a/util-vserver/src/vutil.p +++ b/util-vserver/src/vutil.p @@ -30,7 +30,7 @@ int vbuild_chown (const char *path, uid_t uid, gid_t gid); int vbuild_file_copy (const char *src, const char *dst, struct stat&st); -void vutil_loadallpkg (string&refserver, list&packages); +void vutil_loadallpkg (string&refserver, list&packages); int vutil_lstat (string path, struct stat&st); FILE *vutil_execdistcmd (const char *key, const string&vserver, -- 1.8.1.5