summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xlib/set.rb4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ed19eec40..0fdac16625 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+Thu May 12 08:10:46 2011 Eric Hodel <drbrain@segment7.net>
+
+ * lib/set.rb (class Set): Add nodoc to internal-use methods. Patch
+ by Pete Higgins. [Ruby 1.9 - Bug #4665]
+
Thu May 12 08:01:14 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
- * ext/openssl/ossl_pkey_ec.c: Allow encryption when PEM-encoding
+ * ext/openssl/ossl_pkey_ec.c: Allow encryption when PEM-encoding
Elliptic Curve private keys.
[ruby-core:35329] [Bug #4423]
diff --git a/lib/set.rb b/lib/set.rb
index 5655c263ba..99197961b5 100755
--- a/lib/set.rb
+++ b/lib/set.rb
@@ -76,7 +76,7 @@ class Set
end
end
- def do_with_enum(enum, &block)
+ def do_with_enum(enum, &block) # :nodoc:
if enum.respond_to?(:each_entry)
enum.each_entry(&block)
elsif enum.respond_to?(:each)
@@ -145,7 +145,7 @@ class Set
@hash.keys
end
- def flatten_merge(set, seen = Set.new)
+ def flatten_merge(set, seen = Set.new) # :nodoc:
set.each { |e|
if e.is_a?(Set)
if seen.include?(e_id = e.object_id)