From: Mikko Rasa Date: Sat, 24 Dec 2022 13:11:41 +0000 (+0200) Subject: Remove the now obsolete SubTool class X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c8c51fac9453a677fc3e6932c4730f35e237af89;p=builder.git Remove the now obsolete SubTool class --- diff --git a/source/tool.cpp b/source/tool.cpp index 28523f6..cd00237 100644 --- a/source/tool.cpp +++ b/source/tool.cpp @@ -62,32 +62,6 @@ string Tool::create_build_signature(const BuildInfo &) const } -Target *SubTool::create_source(const Component &c, const FS::Path &p) const -{ - return parent.create_source(c, p); -} - -Target *SubTool::create_source(const FS::Path &p) const -{ - return parent.create_source(p); -} - -Target *SubTool::create_target(const vector &s, const string &a) -{ - return parent.create_target(s, a); -} - -Target *SubTool::create_install(Target &t) const -{ - return parent.create_install(t); -} - -string SubTool::create_build_signature(const BuildInfo &bi) const -{ - return parent.create_build_signature(bi); -} - - void operator>>(const LexicalConverter &conv, Tool::ProcessingUnit &unit) { const string &str = conv.get(); diff --git a/source/tool.h b/source/tool.h index ec5bf02..ca19c6f 100644 --- a/source/tool.h +++ b/source/tool.h @@ -137,26 +137,6 @@ public: Task *run(const Target &t) const { return run_func(t); } }; -/** -Intermediate base class for tool facets. For example, a linker may need to -use different commands depending on whether C++ source files are present or -not, but their presence can't be directly determined from the object files. -*/ -class SubTool: public Tool -{ -protected: - Tool &parent; - - SubTool(Tool &t): Tool(t), parent(t) { } - -public: - Target *create_source(const Component &, const Msp::FS::Path &) const override; - Target *create_source(const Msp::FS::Path &) const override; - Target *create_target(const std::vector &, const std::string & = std::string()) override; - Target *create_install(Target &) const override; - std::string create_build_signature(const BuildInfo &) const override; -}; - template void Tool::set_run(Task *(*f)(const T &))