diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2013-09-08 08:32:58 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2013-09-08 08:32:58 +0100 |
| commit | b40b455286e20ff004882b41b036da8119e061d0 (patch) | |
| tree | 0276074e800b50d4697bd09c521b2bedd4d29455 | |
| parent | 64f0d9760ea6c390c8fc7b5366dc8cb2a31f38be (diff) | |
| download | paludis-b40b455286e20ff004882b41b036da8119e061d0.tar.gz paludis-b40b455286e20ff004882b41b036da8119e061d0.tar.xz | |
Newer ruby haxx
| -rw-r--r-- | ruby/Makefile.am | 1 | ||||
| -rw-r--r-- | ruby/dep_spec.cc | 4 | ||||
| -rw-r--r-- | ruby/paludis_ruby.cc | 4 |
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 46211d5ba..a9e40342c 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; @@ -970,7 +970,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; } |