aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2013-09-08 08:32:58 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2013-10-13 18:01:54 +0100
commit8eee4e53b127049520399ab905544ad75b22ceb4 (patch)
tree5fb76a30cdaeb4128d66748cbf57aa3e4e9ff33f
parent4291a25dbcb88246f22df355929f168dfdf842ea (diff)
downloadpaludis-8eee4e53b127049520399ab905544ad75b22ceb4.tar.gz
paludis-8eee4e53b127049520399ab905544ad75b22ceb4.tar.xz
Newer ruby haxx
-rw-r--r--ruby/Makefile.am1
-rw-r--r--ruby/dep_spec.cc4
-rw-r--r--ruby/paludis_ruby.cc4
3 files changed, 5 insertions, 4 deletions
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 34f947a4a..a339ac571 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -8,6 +8,7 @@ AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ \
@PALUDIS_CXXFLAGS_NO_WMISSING_NORETURN@ \
@PALUDIS_CXXFLAGS_NO_WREDUNDANT_DECLS@ \
@PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST@ \
+ @PALUDIS_CXXFLAGS_NO_WSHADOW@ \
@PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
diff --git a/ruby/dep_spec.cc b/ruby/dep_spec.cc
index ad9ee78dd..8fe8415c8 100644
--- a/ruby/dep_spec.cc
+++ b/ruby/dep_spec.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2013 Ciaran McCreesh
* Copyright (c) 2006, 2007, 2008 Richard Brown
*
* This file is part of the Paludis package manager. Paludis is free software;
@@ -972,7 +972,7 @@ namespace
else if (SYM2ID(entry) == rb_intern("no_disambiguation"))
o += updso_no_disambiguation;
else
- rb_raise(rb_eArgError, "Unknown parse_user_package_dep_spec option '%s'", rb_obj_as_string(entry));
+ rb_raise(rb_eArgError, "Unknown parse_user_package_dep_spec option '%s'", RSTRING_PTR(rb_obj_as_string(entry)));
}
Filter f(
diff --git a/ruby/paludis_ruby.cc b/ruby/paludis_ruby.cc
index a69ca2c44..587601c78 100644
--- a/ruby/paludis_ruby.cc
+++ b/ruby/paludis_ruby.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2013 Ciaran McCreesh
* Copyright (c) 2006, 2007, 2008 Richard Brown
*
* This file is part of the Paludis package manager. Paludis is free software;
@@ -387,7 +387,7 @@ paludis::ruby::value_to_match_package_options(VALUE v)
if (SYM2ID(entry) == rb_intern("ignore_additional_requirements"))
o += mpo_ignore_additional_requirements;
else
- rb_raise(rb_eArgError, "Unknown MatchPackageOptions option '%s'", rb_obj_as_string(entry));
+ rb_raise(rb_eArgError, "Unknown MatchPackageOptions option '%s'", RSTRING_PTR(rb_obj_as_string(entry)));
}
return o;
}