Various cleanups

diff --git a/source/builder.cpp b/source/builder.cpp
index 94acd45f8099f907f5650f1d1e19428be38a0c07..3776e36ef169dc09db238d2630a16f051cc17de5 100644 (file)
--- 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 7998a393eb4ab9f5a513dbcb544dba7836a71a3b..d12cf003a68d7fc4d994b47b9dcb8f611f1622ff 100644 (file)
--- 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 9e583732206a269eadf01ebcbe8dc4bc6abb272b..1546a56bea3b5b83b1d48a5c5ed532f9315595e4 100644 (file)
--- 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 fe79dccc25647470708bc686d6d31dc0374943a8..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.
 */