diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-10-03 00:18:53 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-10-03 00:18:53 +0200 |
| commit | 30b45652d6b8c710e7a5e7e95cfa431a5df4462c (patch) | |
| tree | 4b0256e549cec64aefa15030f3b812f3209201cb /apt-pkg/pkgcachegen.h | |
| parent | 8b32e72c6f7143de4ec02f44e362b0df9e21e024 (diff) | |
rename StringType VERSION to VERSIONNUMBER
aptitude has a define for VERSION, so to not generate a FTBFS we just
rename our enum element to a slightly less generic name.
Git-Dch: Ignore
Diffstat (limited to 'apt-pkg/pkgcachegen.h')
| -rw-r--r-- | apt-pkg/pkgcachegen.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index e1d22b88f..54c4f9e7a 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -95,8 +95,8 @@ class pkgCacheGenerator /*{{{*/ public: - enum StringType { MIXED, PKGNAME, VERSION, SECTION }; - map_stringitem_t StoreString(enum StringType const type, const char * S, unsigned int const Size); + enum StringType { MIXED, PKGNAME, VERSIONNUMBER, SECTION }; + map_stringitem_t StoreString(StringType const type, const char * S, unsigned int const Size); inline map_stringitem_t StoreString(enum StringType const type, const std::string &S) {return StoreString(type, S.c_str(),S.length());}; void DropProgress() {Progress = 0;}; |