summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-10 07:35:37 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-10 07:35:37 +0000
commite0a7803c8f5f3efca2648add1051456d70a92574 (patch)
treebc92bc500603b0bd39b5462e8437ed8f687bde9a
parentc993ee03277b8faae1be8466a827cd48102c52e9 (diff)
downloadruby-e0a7803c8f5f3efca2648add1051456d70a92574.tar.gz
ruby-e0a7803c8f5f3efca2648add1051456d70a92574.tar.xz
ruby-e0a7803c8f5f3efca2648add1051456d70a92574.zip
Don't override Enumerable#inject for 1.9
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13861 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/soap/property.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2691770c1..cf526b64d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Nov 10 16:34:21 2007 Eric Hodel <drbrain@segment7.net>
+
+ * lib/soap/property.rb: Don't override Enumerable#inject for 1.9.
+
Sat Nov 10 14:43:30 2007 David Flanagan <davidflanagan@ruby-lang.org>
* parse.y: use ASCII encoding for string literals that are
diff --git a/lib/soap/property.rb b/lib/soap/property.rb
index 51f2e8262..0dc455105 100644
--- a/lib/soap/property.rb
+++ b/lib/soap/property.rb
@@ -320,7 +320,7 @@ end
# for ruby/1.6.
-unless Enumerable.instance_methods.include?('inject')
+if RUBY_VERSION < "1.8" then
module Enumerable
def inject(init)
result = init