diff --git a/ChangeLog b/ChangeLog index ee86f30a80..6ebd9ba029 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 29 19:21:02 2016 Pete Higgins + + * 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 Sep 28 23:14:19 2016 Nobuyoshi Nakada * lib/pstore.rb (PStore::CHECKSUM_ALGO): find available hashing diff --git a/thread_sync.c b/thread_sync.c index d7975beeff..3b2286ab35 100644 --- a/thread_sync.c +++ b/thread_sync.c @@ -1274,11 +1274,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, @@ -1294,10 +1294,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(