aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 23:56:13 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 23:56:13 +0100
commit60d01bc8905290a4575ee218abd8cb2b547b5608 (patch)
tree415e62ca002ed1e2175ed71d723beda0ff818cbd
parent3ea82d7e0603bdedca519e531f2692c6f788d2e7 (diff)
downloadpaludis-60d01bc8905290a4575ee218abd8cb2b547b5608.tar.gz
paludis-60d01bc8905290a4575ee218abd8cb2b547b5608.tar.xz
Remove profiles virtuals support
-rw-r--r--paludis/repositories/e/exheres_profile.cc6
-rw-r--r--paludis/repositories/e/exheres_profile.hh3
-rw-r--r--paludis/repositories/e/profile.cc6
-rw-r--r--paludis/repositories/e/profile.hh3
-rw-r--r--paludis/repositories/e/traditional_profile.cc11
-rw-r--r--paludis/repositories/e/traditional_profile.hh3
6 files changed, 0 insertions, 32 deletions
diff --git a/paludis/repositories/e/exheres_profile.cc b/paludis/repositories/e/exheres_profile.cc
index 046967a..2526c88 100644
--- a/paludis/repositories/e/exheres_profile.cc
+++ b/paludis/repositories/e/exheres_profile.cc
@@ -332,9 +332,3 @@ ExheresProfile::system_packages() const
return _imp->system_packages;
}
-const std::shared_ptr<const Map<QualifiedPackageName, PackageDepSpec> >
-ExheresProfile::virtuals() const
-{
- return std::make_shared<Map<QualifiedPackageName, PackageDepSpec>>();
-}
-
diff --git a/paludis/repositories/e/exheres_profile.hh b/paludis/repositories/e/exheres_profile.hh
index c896315..f2b0f7b 100644
--- a/paludis/repositories/e/exheres_profile.hh
+++ b/paludis/repositories/e/exheres_profile.hh
@@ -98,9 +98,6 @@ namespace paludis
virtual const std::shared_ptr<const MasksInfo> profile_masks(const std::shared_ptr<const PackageID> &) const;
virtual const std::shared_ptr<const SetSpecTree> system_packages() const;
-
- virtual const std::shared_ptr<const Map<QualifiedPackageName, PackageDepSpec> >
- virtuals() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
}
diff --git a/paludis/repositories/e/profile.cc b/paludis/repositories/e/profile.cc
index 5d8faa1..c6fc759 100644
--- a/paludis/repositories/e/profile.cc
+++ b/paludis/repositories/e/profile.cc
@@ -24,8 +24,6 @@
#include <paludis/dep_spec.hh>
#include <paludis/choice.hh>
-#include <paludis/util/wrapped_forward_iterator-impl.hh>
-#include <paludis/util/map-impl.hh>
#include <paludis/util/singleton-impl.hh>
using namespace paludis;
@@ -60,9 +58,5 @@ ProfileFactory::create(
throw ConfigurationError("Unrecognised profile '" + format + "'");
}
-template class Map<QualifiedPackageName, PackageDepSpec>;
-template class WrappedForwardIterator<Map<QualifiedPackageName, PackageDepSpec>::ConstIteratorTag,
- const std::pair<const QualifiedPackageName, PackageDepSpec> >;
-
template class Singleton<ProfileFactory>;
diff --git a/paludis/repositories/e/profile.hh b/paludis/repositories/e/profile.hh
index 0fdbefb..8f2c60e 100644
--- a/paludis/repositories/e/profile.hh
+++ b/paludis/repositories/e/profile.hh
@@ -98,9 +98,6 @@ namespace paludis
virtual const std::shared_ptr<const MasksInfo> profile_masks(const std::shared_ptr<const PackageID> &) const = 0;
virtual const std::shared_ptr<const SetSpecTree> system_packages() const = 0;
-
- virtual const std::shared_ptr<const Map<QualifiedPackageName, PackageDepSpec> >
- virtuals() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
};
class PALUDIS_VISIBLE ProfileFactory :
diff --git a/paludis/repositories/e/traditional_profile.cc b/paludis/repositories/e/traditional_profile.cc
index f3c794a..ba9b8f9 100644
--- a/paludis/repositories/e/traditional_profile.cc
+++ b/paludis/repositories/e/traditional_profile.cc
@@ -107,7 +107,6 @@ namespace paludis
const bool has_master_repositories;
TraditionalProfileFile<LineConfigFile> packages_file;
- TraditionalProfileFile<LineConfigFile> virtuals_file;
TraditionalProfileFile<TraditionalMaskFile> package_mask_file;
std::shared_ptr<FSPathSequence> profiles_with_parents;
@@ -116,8 +115,6 @@ namespace paludis
std::shared_ptr<SetSpecTree> system_packages;
- std::shared_ptr<Map<QualifiedPackageName, PackageDepSpec> > virtuals;
-
std::set<std::pair<ChoicePrefixName, UnprefixedChoiceName> > use;
std::shared_ptr<Set<std::string> > use_expand;
std::shared_ptr<Set<std::string> > use_expand_hidden;
@@ -141,11 +138,9 @@ namespace paludis
is_arch_flag(a),
has_master_repositories(h),
packages_file(eapi_for_file),
- virtuals_file(eapi_for_file),
package_mask_file(eapi_for_file),
profiles_with_parents(std::make_shared<FSPathSequence>()),
system_packages(std::make_shared<SetSpecTree>(std::make_shared<AllDepSpec>())),
- virtuals(std::make_shared<Map<QualifiedPackageName, PackageDepSpec>>()),
use_expand(std::make_shared<Set<std::string>>()),
use_expand_hidden(std::make_shared<Set<std::string>>()),
use_expand_unprefixed(std::make_shared<Set<std::string>>()),
@@ -983,12 +978,6 @@ TraditionalProfile::system_packages() const
return _imp->system_packages;
}
-const std::shared_ptr<const Map<QualifiedPackageName, PackageDepSpec> >
-TraditionalProfile::virtuals() const
-{
- return _imp->virtuals;
-}
-
const std::shared_ptr<const MasksInfo>
TraditionalProfile::profile_masks(const std::shared_ptr<const PackageID> & id) const
{
diff --git a/paludis/repositories/e/traditional_profile.hh b/paludis/repositories/e/traditional_profile.hh
index 14a637b..b3d2446 100644
--- a/paludis/repositories/e/traditional_profile.hh
+++ b/paludis/repositories/e/traditional_profile.hh
@@ -97,9 +97,6 @@ namespace paludis
virtual const std::shared_ptr<const MasksInfo> profile_masks(const std::shared_ptr<const PackageID> &) const;
virtual const std::shared_ptr<const SetSpecTree> system_packages() const;
-
- virtual const std::shared_ptr<const Map<QualifiedPackageName, PackageDepSpec> >
- virtuals() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
}