ko1	2014-02-04 16:17:59 +0900 (Tue, 04 Feb 2014)

  New Revision: 44806

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44806

  Log:
    * string.c: use STR_SHARED instead of ELTS_SHARED.
      (same value, but more clear meaning)

  Modified files:
    trunk/ChangeLog
    trunk/string.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44805)
+++ ChangeLog	(revision 44806)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Feb  4 16:16:58 2014  Koichi Sasada  <ko1@a...>
+
+	* string.c: use STR_SHARED instead of ELTS_SHARED.
+	  (same value, but more clear meaning)
+
 Tue Feb  4 16:09:14 2014  Koichi Sasada  <ko1@a...>
 
 	* string.c: remvoe STR_ASSOC related code.
Index: string.c
===================================================================
--- string.c	(revision 44805)
+++ string.c	(revision 44806)
@@ -50,7 +50,7 @@ VALUE rb_cSymbol; https://github.com/ruby/ruby/blob/trunk/string.c#L50
 #define RUBY_MAX_CHAR_LEN 16
 #define STR_TMPLOCK FL_USER7
 #define STR_UNSET_NOCAPA(s) do {\
-    if (FL_TEST((s),STR_NOEMBED)) FL_UNSET((s),(ELTS_SHARED));\
+    if (FL_TEST((s),STR_NOEMBED)) FL_UNSET((s),(STR_SHARED));\
 } while (0)
 
 #define STR_SET_NOEMBED(str) do {\
@@ -115,7 +115,7 @@ VALUE rb_cSymbol; https://github.com/ruby/ruby/blob/trunk/string.c#L115
 
 #define STR_SET_SHARED(str, shared_str) do { \
     RB_OBJ_WRITE((str), &RSTRING(str)->as.heap.aux.shared, (shared_str)); \
-    FL_SET((str), ELTS_SHARED); \
+    FL_SET((str), STR_SHARED); \
 } while (0)
 
 #define STR_HEAP_PTR(str)  (RSTRING(str)->as.heap.ptr)
@@ -942,7 +942,7 @@ rb_str_free(VALUE str) https://github.com/ruby/ruby/blob/trunk/string.c#L942
 RUBY_FUNC_EXPORTED size_t
 rb_str_memsize(VALUE str)
 {
-    if (FL_TEST(str, STR_NOEMBED|ELTS_SHARED) == STR_NOEMBED) {
+    if (FL_TEST(str, STR_NOEMBED|STR_SHARED) == STR_NOEMBED) {
 	return STR_HEAP_SIZE(str);
     }
     else {
@@ -1024,7 +1024,7 @@ str_replace(VALUE str, VALUE str2) https://github.com/ruby/ruby/blob/trunk/string.c#L1024
 	STR_SET_NOEMBED(str);
 	RSTRING(str)->as.heap.len = len;
 	RSTRING(str)->as.heap.ptr = RSTRING_PTR(str2);
-	FL_SET(str, ELTS_SHARED);
+	FL_SET(str, STR_SHARED);
 	STR_SET_SHARED(str, shared);
     }
     else {
@@ -3548,7 +3548,7 @@ rb_str_drop_bytes(VALUE str, long len) https://github.com/ruby/ruby/blob/trunk/string.c#L3548
     nlen = olen - len;
     if (nlen <= RSTRING_EMBED_LEN_MAX) {
 	char *oldptr = ptr;
-	int fl = (int)(RBASIC(str)->flags & (STR_NOEMBED|ELTS_SHARED));
+	int fl = (int)(RBASIC(str)->flags & (STR_NOEMBED|STR_SHARED));
 	STR_SET_EMBED(str);
 	STR_SET_EMBED_LEN(str, nlen);
 	ptr = RSTRING(str)->as.ary;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/