From 0d1f4fb57deeeb88f55751bf71ad7c2e90ac47b1 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 29 May 2015 05:03:43 +0000 Subject: merge revision(s) 49491: [Backport #10823] * ext/bigdecimal/bigdecimal.c (VpSetPTR): fix a typo, 'expoennt' to 'exponent'. [ruby-core:67980] [Bug #10823] [Fix GH-825] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/bigdecimal/bigdecimal.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76578db53a..eac9953e71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri May 29 14:03:33 2015 Matt Hoyle + + * ext/bigdecimal/bigdecimal.c (VpSetPTR): fix a typo, 'expoennt' + to 'exponent'. [ruby-core:67980] [Bug #10823] [Fix GH-825] + Fri May 29 14:00:16 2015 Nobuyoshi Nakada * win32/file.c (rb_file_expand_path_internal): neither the drive diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index 4413d8f0a6..7c1e6bd2f3 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -4386,7 +4386,7 @@ VpSetPTR(Real *a, Real *b, Real *c, size_t *a_pos, size_t *b_pos, size_t *c_pos, size_t const round_limit = (VpGetPrecLimit() + BASE_FIG - 1) / BASE_FIG; - assert(a->exponent >= b->expoennt); + assert(a->exponent >= b->exponent); c->frac[0] = 0; *av = *bv = 0; diff --git a/version.h b/version.h index 6bb7e16473..8e581f2136 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.7" #define RUBY_RELEASE_DATE "2015-05-29" -#define RUBY_PATCHLEVEL 361 +#define RUBY_PATCHLEVEL 362 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 5 -- cgit v1.2.3