Use default member initializers and constructor delegation

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 601627185a26e9e21f558567807d547fcc623733..2c478a861d9023e9b423cd55a4079e40dfc8fe10 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -27,7 +27,6 @@ using namespace Msp;
 SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
        Package(b, n),
        source_dir(FS::dirname(f)),
-       build_type(0),
        config(*this),
        cache(*this)
 {
@@ -195,7 +194,10 @@ void SourcePackage::Loader::finish()
        other components wil be created first */
        auto i = find(obj.components, obj.source_archive);
        if(i!=obj.components.end())
-               obj.components.splice(obj.components.end(), obj.components, i);
+       {
+               obj.components.erase(i);
+               obj.components.push_back(obj.source_archive);
+       }
 }
 
 void SourcePackage::Loader::feature(const string &n, const string &d)