archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 56285: [Backport #14354]

Browse source 
* thread_sync.c (Init_thread_sync): Remove confusing doc comments,
	  which are picked up by rdoc unexpectedly, from Queue and
	  SizedQueue.  [Fix GH-1450]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-01-31 13:52:40 +00:00
parent c5a99cf3c0
commit 4cc2435aa7
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Jan 31 22:51:59 2018 Pete Higgins <pete@peterhiggins.org>
* thread_sync.c (Init_thread_sync): Remove confusing doc comments,
which are picked up by rdoc unexpectedly, from Queue and
SizedQueue. [Fix GH-1450]
Wed Jan 31 22:48:41 2018 Eric Wong <normalperson@yhbt.net>
thread_pthread.c: do not wakeup inside child processes

18
thread_sync.c
View file

@ -1258,11 +1258,11 @@ Init_thread_sync(void)
rb_define_method(rb_cQueue, "length", rb_queue_length, 0);
rb_define_method(rb_cQueue, "num_waiting", rb_queue_num_waiting, 0);
rb_define_alias(rb_cQueue, "enq", "push"); /* Alias for #push. */
rb_define_alias(rb_cQueue, "<<", "push"); /* Alias for #push. */
rb_define_alias(rb_cQueue, "deq", "pop"); /* Alias for #pop. */
rb_define_alias(rb_cQueue, "shift", "pop"); /* Alias for #pop. */
rb_define_alias(rb_cQueue, "size", "length"); /* Alias for #length. */
rb_define_alias(rb_cQueue, "enq", "push");
rb_define_alias(rb_cQueue, "<<", "push");
rb_define_alias(rb_cQueue, "deq", "pop");
rb_define_alias(rb_cQueue, "shift", "pop");
rb_define_alias(rb_cQueue, "size", "length");
rb_cSizedQueue = rb_struct_define_without_accessor_under(
rb_cThread,
@ -1278,10 +1278,10 @@ Init_thread_sync(void)
rb_define_method(rb_cSizedQueue, "clear", rb_szqueue_clear, 0);
rb_define_method(rb_cSizedQueue, "num_waiting", rb_szqueue_num_waiting, 0);
rb_define_alias(rb_cSizedQueue, "enq", "push"); /* Alias for #push. */
rb_define_alias(rb_cSizedQueue, "<<", "push"); /* Alias for #push. */
rb_define_alias(rb_cSizedQueue, "deq", "pop"); /* Alias for #pop. */
rb_define_alias(rb_cSizedQueue, "shift", "pop"); /* Alias for #pop. */
rb_define_alias(rb_cSizedQueue, "enq", "push");
rb_define_alias(rb_cSizedQueue, "<<", "push");
rb_define_alias(rb_cSizedQueue, "deq", "pop");
rb_define_alias(rb_cSizedQueue, "shift", "pop");
/* CVar */
rb_cConditionVariable = rb_struct_define_without_accessor_under(

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.7"
#define RUBY_RELEASE_DATE "2018-01-31"
#define RUBY_PATCHLEVEL 404
#define RUBY_PATCHLEVEL 405
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 1