From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16043 invoked by alias); 31 May 2017 11:05:29 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 16017 invoked by uid 89); 31 May 2017 11:05:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy= X-HELO: rgout03.bt.lon5.cpcloud.co.uk Received: from rgout0304.bt.lon5.cpcloud.co.uk (HELO rgout03.bt.lon5.cpcloud.co.uk) (65.20.0.210) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 31 May 2017 11:05:27 +0000 X-OWM-Source-IP: 86.141.128.130 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=8/50,refid=2.7.2:2017.5.25.40315:17:8.707,ip=,rules=NO_URI_FOUND, NO_CTA_URI_FOUND, NO_MESSAGE_ID, NO_URI_HTTPS, TO_MALFORMED Received: from localhost.localdomain (86.141.128.130) by rgout03.bt.lon5.cpcloud.co.uk (9.0.019.13-1) (authenticated as jonturney@btinternet.com) id 58A82A5C0B89CA2E; Wed, 31 May 2017 12:05:29 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 11/14] Drop in SolvableVersion as a replacement for packageversion Date: Wed, 31 May 2017 11:05:00 -0000 Message-Id: <20170531110509.241220-1-jon.turney@dronecode.org.uk> In-Reply-To: <20170531105015.162228-1-jon.turney@dronecode.org.uk> References: <20170531105015.162228-1-jon.turney@dronecode.org.uk> X-SW-Source: 2017-05/txt/msg00172.txt.bz2 --- Makefile.am | 1 + PackageSpecification.h | 4 +++- package_db.cc | 1 + package_meta.h | 3 ++- package_version.h | 21 +++++++++++++++++++++ 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 package_version.h diff --git a/Makefile.am b/Makefile.am index 7ea9d89..7fe4b2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -208,6 +208,7 @@ inilint_SOURCES = \ package_meta.h \ package_source.cc \ package_source.h \ + package_version.h \ PackageSpecification.cc \ PackageSpecification.h \ PackageTrust.h \ diff --git a/PackageSpecification.h b/PackageSpecification.h index ef992fa..0706ec8 100644 --- a/PackageSpecification.h +++ b/PackageSpecification.h @@ -18,7 +18,9 @@ #include #include "String++.h" -class packageversion; + +class SolvableVersion; +typedef SolvableVersion packageversion; /* Describe a package - i.e. we need version 5 of apt */ diff --git a/package_db.cc b/package_db.cc index ae71900..123e4f3 100644 --- a/package_db.cc +++ b/package_db.cc @@ -31,6 +31,7 @@ #include "compress.h" #include "filemanip.h" +#include "package_version.h" #include "package_db.h" #include "package_meta.h" #include "Exception.h" diff --git a/package_meta.h b/package_meta.h index 421646a..b6faab8 100644 --- a/package_meta.h +++ b/package_meta.h @@ -16,7 +16,8 @@ #ifndef SETUP_PACKAGE_META_H #define SETUP_PACKAGE_META_H -class packageversion; +class SolvableVersion; +typedef SolvableVersion packageversion; class packagemeta; #include diff --git a/package_version.h b/package_version.h new file mode 100644 index 0000000..43cf146 --- /dev/null +++ b/package_version.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2017 Jon Turney + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * A copy of the GNU General Public License can be found at + * http://www.gnu.org/ + * + */ + +#ifndef PACKAGE_VERSION_H +#define PACKAGE_VERSION_H + +#include "libsolv.h" + +typedef SolvableVersion packageversion; + +#endif // PACKAGE_VERSION_H -- 2.12.3