aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-04 20:32:59 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-04 20:32:59 +0000
commit1a779ab91fb123e8cafe52c8182c4baad7228bd6 (patch)
tree0c9f0600558f8388f25b905519bd0e38242b230d
parenta9dd2f039320abd8beba8710550749305a06ba97 (diff)
downloadpaludis-1a779ab91fb123e8cafe52c8182c4baad7228bd6.tar.gz
paludis-1a779ab91fb123e8cafe52c8182c4baad7228bd6.tar.xz
r3218@snowflake: ciaranm | 2007-06-04 21:30:57 +0100
Fix 3.4 compile
-rwxr-xr-xmisc/make_sr.bash2
-rw-r--r--paludis/repositories/gems/gems_repository.cc2
-rw-r--r--paludis/repositories/gems/installed_gems_repository.cc4
3 files changed, 4 insertions, 4 deletions
diff --git a/misc/make_sr.bash b/misc/make_sr.bash
index facf9f5..ab61042 100755
--- a/misc/make_sr.bash
+++ b/misc/make_sr.bash
@@ -470,7 +470,7 @@ while read a ; do
echo "class ${a}::NamedArguments"
echo "{"
echo " friend class ${a};"
- echo " private:"
+ echo " public:"
for (( k = 0 ; k < ${#want_keys[@]} ; k++ )) ; do
echo " const typename paludis::Select<has_${k}_, ${want_key_types[${k}]% ->*}, paludis::Empty>::Type _v${k};"
diff --git a/paludis/repositories/gems/gems_repository.cc b/paludis/repositories/gems/gems_repository.cc
index 849d3bf..00db657 100644
--- a/paludis/repositories/gems/gems_repository.cc
+++ b/paludis/repositories/gems/gems_repository.cc
@@ -153,7 +153,7 @@ GemsRepository::do_version_specs(const QualifiedPackageName & q) const
MakeHashedMap<QualifiedPackageName, tr1::shared_ptr<VersionSpecCollection> >::Type::const_iterator i(
_imp->versions.find(q));
- if (_imp->versions.end() == i)
+ if (i == _imp->versions.end())
return make_shared_ptr(new VersionSpecCollection::Concrete);
return i->second;
diff --git a/paludis/repositories/gems/installed_gems_repository.cc b/paludis/repositories/gems/installed_gems_repository.cc
index e5d4535..8022a13 100644
--- a/paludis/repositories/gems/installed_gems_repository.cc
+++ b/paludis/repositories/gems/installed_gems_repository.cc
@@ -157,7 +157,7 @@ InstalledGemsRepository::do_version_specs(const QualifiedPackageName & q) const
need_entries();
VersionsMap::const_iterator i(_imp->versions.find(q));
- if (_imp->versions.end() == i)
+ if (i == _imp->versions.end())
return make_shared_ptr(new VersionSpecCollection::Concrete);
return i->second;
@@ -241,7 +241,7 @@ void
InstalledGemsRepository::need_version_metadata(const QualifiedPackageName & q, const VersionSpec & v) const
{
MetadataMap::const_iterator i(_imp->metadata.find(std::make_pair(q, v)));
- if (_imp->metadata.end() != i)
+ if (i != _imp->metadata.end())
return;
Context c("When loading version metadata for '" + stringify(PackageDatabaseEntry(q, v, name())) + "':");