From 97c38fc7c02260a2d213d9a16d878a0410b9d57a Mon Sep 17 00:00:00 2001 From: Ciaran McCreesh Date: Mon, 27 Dec 2010 23:54:51 +0000 Subject: Pass PackageIDs by shared_ptr --- ruby/environment.cc | 4 ++-- ruby/paludis_ruby.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ruby') diff --git a/ruby/environment.cc b/ruby/environment.cc index a33172a70..e8befb2b5 100644 --- a/ruby/environment.cc +++ b/ruby/environment.cc @@ -121,7 +121,7 @@ namespace try { return value_to_environment(self)->accept_license( - std::string(StringValuePtr(license)), *(value_to_package_id(p))) ? Qtrue : Qfalse; + std::string(StringValuePtr(license)), (value_to_package_id(p))) ? Qtrue : Qfalse; } catch (const std::exception & e) { @@ -151,7 +151,7 @@ namespace VALUE kw = rb_ary_entry(keywords, i); knc->insert(KeywordName(StringValuePtr(kw))); } - return value_to_environment(self)->accept_keywords(knc, *value_to_package_id(p)) ? Qtrue : Qfalse; + return value_to_environment(self)->accept_keywords(knc, value_to_package_id(p)) ? Qtrue : Qfalse; } catch (const std::exception & e) { diff --git a/ruby/paludis_ruby.cc b/ruby/paludis_ruby.cc index 2bed22d63..95d68140b 100644 --- a/ruby/paludis_ruby.cc +++ b/ruby/paludis_ruby.cc @@ -92,7 +92,7 @@ namespace std::shared_ptr spec = value_to_package_dep_spec(a); std::shared_ptr target = value_to_package_id(t); MatchPackageOptions options(value_to_match_package_options(o)); - return match_package(*env, *spec, *target, options) ? Qtrue : Qfalse; + return match_package(*env, *spec, target, options) ? Qtrue : Qfalse; } catch (const std::exception & e) { @@ -118,7 +118,7 @@ namespace std::shared_ptr spec = value_to_dep_tree(a); std::shared_ptr target = value_to_package_id(t); MatchPackageOptions options(value_to_match_package_options(o)); - return match_package_in_set(*env, *spec, *target, options) ? Qtrue : Qfalse; + return match_package_in_set(*env, *spec, target, options) ? Qtrue : Qfalse; } catch (const std::exception & e) { -- cgit v1.2.3