Fix RSTRING_PTR usage in Ruby #2375
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pepone
commented
Jun 28, 2024
| @@ -79,39 +79,4 @@ extern "C" | |||
|
|
|||
| #define CAST_METHOD(X) reinterpret_cast<ICE_RUBY_ENTRY_POINT>(X) | |||
|
|
|||
| // | |||
There was a problem hiding this comment.
We can drop support for these ancient Ruby versions and remove the compatibility macros.
bernardnormier
approved these changes
Jun 28, 2024
ruby/src/IceRuby/Util.cpp
Outdated
| @@ -208,7 +208,7 @@ IceRuby::RubyException::operator<<(ostream& ostr) const | |||
| { | |||
| volatile VALUE cls = rb_class_path(CLASS_OF(ex)); | |||
| volatile VALUE msg = rb_obj_as_string(ex); | |||
| ostr << RSTRING_PTR(cls) << ": " << RSTRING_PTR(msg); | |||
| ostr << string(RSTRING_PTR(cls), RSTRING_LEN(cls)) << ": " << string(RSTRING_PTR(msg), RSTRING_LEN(msg)); | |||
There was a problem hiding this comment.
It would be cleaner to use string_view here and {} for the ctor:
ostr << string_view{s, count} << ....
ruby/src/IceRuby/Operation.cpp
Outdated
| @@ -574,7 +574,7 @@ IceRuby::OperationI::unmarshalException(const vector<byte>& bytes, const Ice::Co | |||
| volatile VALUE cls = CLASS_OF(ex); | |||
| volatile VALUE path = callRuby(rb_class_path, cls); | |||
| assert(TYPE(path) == T_STRING); | |||
| throw Ice::UnknownUserException{__FILE__, __LINE__, RSTRING_PTR(path)}; | |||
| throw Ice::UnknownUserException{__FILE__, __LINE__, string(RSTRING_PTR(path), RSTRING_LEN(path))}; | |||
There was a problem hiding this comment.
string is fine here. I would use {}.
InsertCreativityHere
pushed a commit
to InsertCreativityHere/compiler-comparison
that referenced
this pull request
Jan 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #2342