Be explicit about crefs

5 files changed, 7 insertions, 7 deletions

diff --git a/paludis/elike_package_dep_spec.cc b/paludis/elike_package_dep_spec.cc
index 4dc1ac156..91433ef17 100644
--- a/paludis/elike_package_dep_spec.cc
+++ b/paludis/elike_package_dep_spec.cc
@@ -490,7 +490,7 @@ paludis::partial_parse_elike_package_dep_spec(
                 n::get_remove_version_operator() = std::bind(&elike_get_remove_version_operator, _1, options),
                 n::has_version_operator() = std::bind(&elike_has_version_operator, _1,
                         std::cref(had_bracket_version_requirements), options),
-                n::options_for_partially_made_package_dep_spec() = std::bind(&fixed_options_for_partially_made_package_dep_spec, o),
+                n::options_for_partially_made_package_dep_spec() = std::bind(&fixed_options_for_partially_made_package_dep_spec, std::cref(o)),
                 n::remove_trailing_repo_if_exists() = std::bind(&elike_remove_trailing_repo_if_exists, _1, _2, options),
                 n::remove_trailing_slot_if_exists() = std::bind(&elike_remove_trailing_slot_if_exists, _1, _2, options),
                 n::remove_trailing_square_bracket_if_exists() = std::bind(&elike_remove_trailing_square_bracket_if_exists,
diff --git a/paludis/environments/paludis/bashable_conf.cc b/paludis/environments/paludis/bashable_conf.cc
index 4095e9ff2..53c69e04c 100644
--- a/paludis/environments/paludis/bashable_conf.cc
+++ b/paludis/environments/paludis/bashable_conf.cc
@@ -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
@@ -111,7 +111,7 @@ paludis::paludis_environment::make_bashable_kv_conf(const FSPath & f,
     else
     {
         result = std::make_shared<KeyValueConfigFile>(f, o,
-                std::bind(&defined_vars_to_kv_func, predefined_variables, std::placeholders::_1, std::placeholders::_2),
+                std::bind(&defined_vars_to_kv_func, std::cref(predefined_variables), std::placeholders::_1, std::placeholders::_2),
                 &KeyValueConfigFile::no_transformation);
     }
 
diff --git a/paludis/format_messages_output_manager.cc b/paludis/format_messages_output_manager.cc
index 829101421..2d4df9e6e 100644
--- a/paludis/format_messages_output_manager.cc
+++ b/paludis/format_messages_output_manager.cc
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2010 Ciaran McCreesh
+ * Copyright (c) 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
@@ -206,7 +206,7 @@ FormatMessagesOutputManager::factory_create(
     std::shared_ptr<OutputManager> child(create_child_function(child_s));
 
     FormatMessagesOutputManagerFormatFunction format_func(std::bind(
-                &format_message, replace_vars_func, std::placeholders::_1, std::placeholders::_2));
+                &format_message, std::cref(replace_vars_func), std::placeholders::_1, std::placeholders::_2));
 
     return std::make_shared<FormatMessagesOutputManager>(
                 child, format_debug_s, format_info_s, format_warn_s, format_error_s, format_log_s, format_status_s, format_func);
diff --git a/paludis/legacy/dep_list.cc b/paludis/legacy/dep_list.cc
index 6fed80fd6..431180d58 100644
--- a/paludis/legacy/dep_list.cc
+++ b/paludis/legacy/dep_list.cc
@@ -1220,7 +1220,7 @@ DepList::add_package(const std::shared_ptr<const PackageID> & p, const std::shar
                         n::state() = dle_has_all_deps,
                         n::tags() = std::shared_ptr<DepListEntryTags>(std::make_shared<DepListEntryTags>())
                         )));
-            _imp->merge_list_index.insert(std::make_pair((*i)->text(), our_merge_entry_post_position));
+            _imp->merge_list_index.insert(std::make_pair(QualifiedPackageName((*i)->text()), our_merge_entry_post_position));
         }
     }
 
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index 8dbb402f2..74c956566 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -317,7 +317,7 @@ paludis::parse_user_package_dep_spec(const std::string & ss, const Environment *
                     ELikePackageDepSpecOptions() + epdso_allow_tilde_greater_deps + epdso_nice_equal_star),
             n::has_version_operator() = std::bind(&elike_has_version_operator, _1,
                     std::cref(had_bracket_version_requirements), ELikePackageDepSpecOptions()),
-            n::options_for_partially_made_package_dep_spec() = std::bind(&fixed_options_for_partially_made_package_dep_spec, o),
+            n::options_for_partially_made_package_dep_spec() = std::bind(&fixed_options_for_partially_made_package_dep_spec, std::cref(o)),
             n::remove_trailing_repo_if_exists() = std::bind(&user_remove_trailing_repo_if_exists, _1, _2),
             n::remove_trailing_slot_if_exists() = std::bind(&user_remove_trailing_slot_if_exists, _1, _2),
             n::remove_trailing_square_bracket_if_exists() = std::bind(&user_remove_trailing_square_bracket_if_exists,