Bit of code cleanup.

cfis · cfis · commit a345d63d5d1a · 2025-08-13T01:01:28.000-07:00
diff --git a/rice/stl/string.ipp b/rice/stl/string.ipp
@@ -85,7 +85,6 @@ namespace Rice::detail
     {
     }
 
-
     VALUE convert(const std::string* x)
     {
       return detail::protect(rb_external_str_new, x->data(), (long)x->size());
@@ -140,7 +139,7 @@ namespace Rice::detail
 
     std::string convert(VALUE value)
     {
-      detail::protect(rb_check_type, value, (int)T_STRING);
+      detail::protect(rb_check_type, value, (int)RUBY_T_STRING);
       return std::string(RSTRING_PTR(value), RSTRING_LEN(value));
     }
 
@@ -172,7 +171,7 @@ namespace Rice::detail
 
     std::string& convert(VALUE value)
     {
-      detail::protect(rb_check_type, value, (int)T_STRING);
+      detail::protect(rb_check_type, value, (int)RUBY_T_STRING);
       this->converted_ = std::string(RSTRING_PTR(value), RSTRING_LEN(value));
       return this->converted_;
     }
@@ -240,7 +239,7 @@ namespace Rice::detail
 
     std::string* convert(VALUE value)
     {
-      detail::protect(rb_check_type, value, (int)T_STRING);
+      detail::protect(rb_check_type, value, (int)RUBY_T_STRING);
       this->converted_ = std::string(RSTRING_PTR(value), RSTRING_LEN(value));
       return &this->converted_;
     }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ namespace Rice::detail`
`85`	`85`	`{`
`86`	`86`	`}`
`87`	`87`
`88`		`-`
`89`	`88`	`VALUE convert(const std::string* x)`
`90`	`89`	`{`
`91`	`90`	`return detail::protect(rb_external_str_new, x->data(), (long)x->size());`
`@@ -140,7 +139,7 @@ namespace Rice::detail`
`140`	`139`
`141`	`140`	`std::string convert(VALUE value)`
`142`	`141`	`{`
`143`		`- detail::protect(rb_check_type, value, (int)T_STRING);`
	`142`	`+ detail::protect(rb_check_type, value, (int)RUBY_T_STRING);`
`144`	`143`	`return std::string(RSTRING_PTR(value), RSTRING_LEN(value));`
`145`	`144`	`}`
`146`	`145`
`@@ -172,7 +171,7 @@ namespace Rice::detail`
`172`	`171`
`173`	`172`	`std::string& convert(VALUE value)`
`174`	`173`	`{`
`175`		`- detail::protect(rb_check_type, value, (int)T_STRING);`
	`174`	`+ detail::protect(rb_check_type, value, (int)RUBY_T_STRING);`
`176`	`175`	`this->converted_ = std::string(RSTRING_PTR(value), RSTRING_LEN(value));`
`177`	`176`	`return this->converted_;`
`178`	`177`	`}`
`@@ -240,7 +239,7 @@ namespace Rice::detail`
`240`	`239`
`241`	`240`	`std::string* convert(VALUE value)`
`242`	`241`	`{`
`243`		`- detail::protect(rb_check_type, value, (int)T_STRING);`
	`242`	`+ detail::protect(rb_check_type, value, (int)RUBY_T_STRING);`
`244`	`243`	`this->converted_ = std::string(RSTRING_PTR(value), RSTRING_LEN(value));`
`245`	`244`	`return &this->converted_;`
`246`	`245`	`}`