Various cleanups

[builder.git] / source / sourcepackage.h

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 1333bdb5ca536a75946a5a4108e4d6acf0fe9c8a..3d868631871591d88e2f511007c3d15c06c60202 100644 (file)
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -15,13 +15,6 @@ class Builder;
 class BuildType;
 class FileTarget;
 
-class bad_expansion: public std::runtime_error
-{
-public:
-       bad_expansion(const std::string &w): std::runtime_error(w) { }
-       virtual ~bad_expansion() throw() { }
-};
-
 /**
 A package that can be built by Builder.
 */
@@ -86,7 +79,7 @@ public:
        const Toolchain &get_toolchain() const { return local_tools; }
        const ComponentList &get_components() const { return components; }
        const Config &get_config() const { return config; }
-       bool match_feature(const std::string &) const;
+       bool match_feature(const std::string &, const std::string *) const;
        void set_build_type(const BuildType &);
        const BuildInfo &get_build_info() const { return build_info; }
 private: