Recent versions of sigc++ require C++11

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index d33ca25ae47900d9f156f6c24ec73fcf5ad1c578..0e1efad028d5d627b69e6e59f32c5b4d60ce7d34 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -5,6 +5,7 @@
 #include <msp/datafile/objectloader.h>
 #include <msp/fs/path.h>
 #include "buildinfo.h"
+#include "conditionalloader.h"
 #include "installmap.h"
 #include "package.h"
 
@@ -19,14 +20,12 @@ their own.
 class Component
 {
 public:
-       class Loader: public Msp::DataFile::ObjectLoader<Component>
+       class Loader: public Msp::DataFile::ObjectLoader<Component>, public ConditionalLoader
        {
        public:
                Loader(Component &);
        private:
                void build_info();
-               void if_arch(const std::string &);
-               void if_feature(const std::string &);
                void install_map();
                void overlay(const std::string &);
                void require(const std::string &);
@@ -48,8 +47,8 @@ protected:
        InstallMap install_map;
        std::list<std::string> problems;
 
-public:
        Component(SourcePackage &, const std::string &);
+public:
        virtual ~Component() { }
 
        const SourcePackage &get_package() const { return package; }