diff options
| author | nagachika <nagachika@ruby-lang.org> | 2021-02-20 12:12:35 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-02-20 12:12:35 +0900 |
| commit | 69d01653f831052acdc803aad0b78690ad61ca86 (patch) | |
| tree | 6d833700829893520fa3b20416e3f42e517b7f8f /version.h | |
| parent | ea222b05571741f36b59f615c2e83b3adafbd398 (diff) | |
merge revision(s) 1b1ea7b3bc9484e6e59d716fce2965a2f39d1e3d,b6e6807993c770c5d2e069d8741f5dadf0b38069: [Backport #17092]
Fix Array#flatten for recursive array when given positive depth [Bug
#17092]
---
array.c | 44 ++++++++++++++++++++++++++------------------
test/ruby/test_array.rb | 14 +++++++++++---
2 files changed, 37 insertions(+), 21 deletions(-)
Initialize memo pointer and use it consistently to silence gcc 7+
---
array.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Diffstat (limited to 'version.h')
| -rw-r--r-- | version.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2,11 +2,11 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 155 +#define RUBY_PATCHLEVEL 156 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 20 #include "ruby/version.h" |