kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 49428: [Backport #10694]

Browse source 
* thread.c: Improve documentation for Thread#value
	  [Bug #10694][ruby-core:67324][ci skip]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-02-06 03:05:23 +00:00
parent 20a130427b
commit ad68184e5a
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Feb 6 12:05:13 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* thread.c: Improve documentation for Thread#value
[Bug #10694][ruby-core:67324][ci skip]
Fri Feb 6 12:02:05 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Feb 6 12:02:05 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/fiddle/win32/libffi.mk.tmpl: assemble without directory prefix. * ext/fiddle/win32/libffi.mk.tmpl: assemble without directory prefix.

6
thread.c
View file

@ -959,10 +959,14 @@ thread_join_m(int argc, VALUE *argv, VALUE self)
* call-seq: * call-seq:
* thr.value -> obj * thr.value -> obj
* *
* Waits for +thr+ to complete, using #join, and returns its value. * Waits for +thr+ to complete, using #join, and returns its value or raises
* the exception which terminated the thread.
* *
* a = Thread.new { 2 + 2 } * a = Thread.new { 2 + 2 }
* a.value #=> 4 * a.value #=> 4
*
* b = Thread.new { raise 'something went wrong' }
* b.value #=> RuntimeError: something went wrong
*/ */
static VALUE static VALUE

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.0" #define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2015-02-06" #define RUBY_RELEASE_DATE "2015-02-06"
#define RUBY_PATCHLEVEL 40 #define RUBY_PATCHLEVEL 41
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2