Rename some variables to avoid conflicts with C++20 keywords

[builder.git] / source / lib / package.h

diff --git a/source/lib/package.h b/source/lib/package.h
index 8e0c6924fc33b85b461cca7b808cc856237adde2..4d2c8dd2b454eb2bd2be18dd02049b6d7b4ffd34 100644 (file)
--- a/source/lib/package.h
+++ b/source/lib/package.h
@@ -7,16 +7,16 @@
 #include "buildinfo.h"
 #include "conditionalloader.h"
 #include "config.h"
+#include "libbuilder_api.h"
 
 class Builder;
-class Package;
 
 /**
 A package is a distributable piece of software.  Package information may be
 obtained in several ways: Build files of source packages, pkg-config for binary
 packages and the builderrc file for binary packages with no pkg-config support.
 */
-class Package
+class LIBBUILDER_API Package
 {
 public:
        class Loader: public Msp::DataFile::ObjectLoader<Package>, public ArchitectureConditional
@@ -35,7 +35,7 @@ protected:
        std::string name;
        std::string label;
 
-       Requirements requires;
+       Requirements required_pkgs;
        BuildInfo export_binfo;
        bool prepared = false;
        bool broken = false;
@@ -50,7 +50,7 @@ public:
        Builder &get_builder() const { return builder; }
        const std::string &get_name() const { return name; }
        const std::string &get_label() const { return label; }
-       const Requirements &get_required_packages() const { return requires; }
+       const Requirements &get_required_packages() const { return required_pkgs; }
 
        const BuildInfo &get_exported_build_info() const { return export_binfo; }