Mark overridden virtual functions as such

[builder.git] / source / binarypackage.h

diff --git a/source/binarypackage.h b/source/binarypackage.h
index 892718484856cfc98a3bf5102a050fd835ab7b74..f015ee55de9dbcf76386bfaa3b7aa9737d7dadc5 100644 (file)
--- a/source/binarypackage.h
+++ b/source/binarypackage.h
@@ -10,7 +10,7 @@ Builder.
 class BinaryPackage: public Package
 {
 public:
-       class Loader: public Msp::DataFile::DerivedObjectLoader<BinaryPackage, Package>
+       class Loader: public Msp::DataFile::DerivedObjectLoader<BinaryPackage, Package::Loader>
        {
        public:
                Loader(BinaryPackage &);
@@ -19,18 +19,24 @@ public:
                void header(const std::string &);
        };
 
+       typedef std::vector<std::string> Flags;
+
 private:
        typedef std::list<std::string> HeaderList;
 
        Msp::FS::Path base_path;
        HeaderList headers;
+       BuildInfo static_binfo;
 
 public:
        BinaryPackage(Builder &, const std::string &);
 
-       static BinaryPackage *from_flags(Builder &, const std::string &, const std::vector<std::string> &);
+       const BuildInfo &get_static_build_info() const { return static_binfo; }
+
+       static BinaryPackage *from_flags(Builder &, const std::string &, const Flags &, const Flags & = Flags());
 private:
-       virtual void do_prepare();
+       static void process_flags(const Flags &, BuildInfo &);
+       void do_prepare() override;
 };
 
 #endif