From aeb23448b5035f4ceb662c487913618d0efff888 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sun, 5 Oct 2014 03:47:08 +0300 Subject: [PATCH] Various cleanups --- source/builder.cpp | 2 +- source/builder.h | 2 -- source/objectfile.h | 2 +- source/sourcepackage.h | 7 ------- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/source/builder.cpp b/source/builder.cpp index 94acd45..3776e36 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -263,7 +263,7 @@ int Builder::clean(bool all, bool dry_run) while(!queue.empty()) { Target *tgt = queue.front(); - queue.erase(queue.begin()); + queue.pop_front(); if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || all)) clean_tgts.insert(tgt); diff --git a/source/builder.h b/source/builder.h index 7998a39..d12cf00 100644 --- a/source/builder.h +++ b/source/builder.h @@ -94,8 +94,6 @@ public: configured. */ void load_build_file(const Msp::FS::Path &, const Config::InputOptions *opts = 0, bool all = false); - void load_build_file(const Msp::FS::Path &, const Config::InputOptions &, bool); - /** Builds the goal targets. The build graph must be prepared first. */ int build(unsigned jobs = 1, bool dry_run = false, bool show_progress = false); diff --git a/source/objectfile.h b/source/objectfile.h index 9e58373..1546a56 100644 --- a/source/objectfile.h +++ b/source/objectfile.h @@ -12,7 +12,7 @@ class ObjectFile: public FileTarget { private: SourceFile &source; - + public: ObjectFile(Builder &, const Component &, SourceFile &); private: diff --git a/source/sourcepackage.h b/source/sourcepackage.h index fe79dcc..3d86863 100644 --- 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. */ -- 2.43.0