diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-01-06 17:57:17 +0000 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-01-07 11:32:56 +0000 |
| commit | 00dc02da2e66a9cc73202cc7e512aa212feba77c (patch) | |
| tree | 65e0116f2a90d953cce033a7294c36a339db3625 | |
| parent | bd35e31901131753ecaf7a9e58a4aea650000de2 (diff) | |
| download | paludis-00dc02da2e66a9cc73202cc7e512aa212feba77c.tar.gz paludis-00dc02da2e66a9cc73202cc7e512aa212feba77c.tar.xz | |
ID isn't needed
| -rw-r--r-- | paludis/repositories/e/e_key.cc | 4 | ||||
| -rw-r--r-- | paludis/repositories/e/e_key.hh | 6 | ||||
| -rw-r--r-- | paludis/repositories/e/ebuild_id.cc | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc index 3aee4c0..b31ab2c 100644 --- a/paludis/repositories/e/e_key.cc +++ b/paludis/repositories/e/e_key.cc @@ -60,8 +60,8 @@ using namespace paludis; using namespace paludis::erepository; -EMutableRepositoryMaskInfoKey::EMutableRepositoryMaskInfoKey(const std::shared_ptr<const ERepositoryID> &, - const std::string & r, const std::string & h, const std::shared_ptr<const RepositoryMaskInfo> & v, const MetadataKeyType t) : +EMutableRepositoryMaskInfoKey::EMutableRepositoryMaskInfoKey(const std::string & r, const std::string & h, + const std::shared_ptr<const RepositoryMaskInfo> & v, const MetadataKeyType t) : _value(v), _r(r), _h(h), diff --git a/paludis/repositories/e/e_key.hh b/paludis/repositories/e/e_key.hh index da356f6..8b45c51 100644 --- a/paludis/repositories/e/e_key.hh +++ b/paludis/repositories/e/e_key.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2007, 2008, 2009, 2010 Ciaran McCreesh + * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -43,8 +43,8 @@ namespace paludis const MetadataKeyType _t; public: - EMutableRepositoryMaskInfoKey(const std::shared_ptr<const ERepositoryID> &, - const std::string &, const std::string &, const std::shared_ptr<const RepositoryMaskInfo> &, const MetadataKeyType); + EMutableRepositoryMaskInfoKey(const std::string &, const std::string &, + const std::shared_ptr<const RepositoryMaskInfo> &, const MetadataKeyType); ~EMutableRepositoryMaskInfoKey(); virtual const std::shared_ptr<const RepositoryMaskInfo> value() const diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc index 5529adc..0e64fe5 100644 --- a/paludis/repositories/e/ebuild_id.cc +++ b/paludis/repositories/e/ebuild_id.cc @@ -346,10 +346,10 @@ EbuildID::need_keys_added() const add_metadata_key(std::make_shared<LiteralMetadataValueKey<std::string>>("EAPI", "EAPI", mkt_internal, _imp->eapi->name())); - _imp->repository_mask = std::make_shared<EMutableRepositoryMaskInfoKey>(shared_from_this(), "repository_mask", "Repository masked", + _imp->repository_mask = std::make_shared<EMutableRepositoryMaskInfoKey>("repository_mask", "Repository masked", e_repo->repository_masked(shared_from_this()), mkt_internal); add_metadata_key(_imp->repository_mask); - _imp->profile_mask = std::make_shared<EMutableRepositoryMaskInfoKey>(shared_from_this(), "profile_mask", "Profile masked", + _imp->profile_mask = std::make_shared<EMutableRepositoryMaskInfoKey>("profile_mask", "Profile masked", e_repo->profile()->profile_masked(shared_from_this()), mkt_internal); add_metadata_key(_imp->profile_mask); |