* array.c (rb_ary_uniq_bang): do not push frozen string from hash

  table.  [ruby-dev:24695]

* array.c (rb_ary_and): ditto.

* array.c (rb_ary_or): ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/string.c b/string.c
index 43c8f7908..6592421f4 100644
--- a/string.c
+++ b/string.c
@@ -4453,7 +4453,7 @@ rb_str_sum(argc, argv, str)
 	return sum;
     }
     else {
-	unsigned int sum = 0;
+       unsigned long sum = 0;
 
 	while (p < pend) {
 	    str_mod_check(str, ptr, len);
@@ -4461,7 +4461,7 @@ rb_str_sum(argc, argv, str)
 	    p++;
 	}
 	if (bits != 0) {
-	    sum &= (1<<bits)-1;
+           sum &= (((unsigned long)1)<<bits)-1;
 	}
 	return rb_int2inum(sum);
     }