Remove most container typedefs and refactor others

[builder.git] / source / package.h

diff --git a/source/package.h b/source/package.h
index 01a43a0fb8453c0fbd1eedfae560b745717a9d7c..a7ae7d4546e1b3d534e3112e5123d756beec914f 100644 (file)
--- a/source/package.h
+++ b/source/package.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <msp/datafile/objectloader.h>
 #include "buildinfo.h"
+#include "conditionalloader.h"
 #include "config.h"
 
 class Builder;
@@ -18,16 +19,15 @@ packages and the builderrc file for binary packages with no pkg-config support.
 class Package
 {
 public:
-       class Loader: public Msp::DataFile::ObjectLoader<Package>
+       class Loader: public Msp::DataFile::ObjectLoader<Package>, public ArchitectureConditional
        {
        public:
                Loader(Package &);
        private:
-               void if_arch(const std::string &);
                void require(const std::string &);
        };
 
-       typedef std::list<Package *> Requirements;
+       using Requirements = std::list<Package *>;
 
 protected:
        Builder &builder;