Project

General

Profile

Backport #9530

r44946 introduces compile error in Solaris

Added by ngoto (Naohisa Goto) over 5 years ago. Updated over 5 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
[ruby-dev:47980]

Description

r44946 にて、ruby_atomic.h の122行目に編集ミスによると思われる異常な行が出現しており、その結果、Solarisにてコンパイルエラーが発生します。

以下の部分です。

@@ -80,7 +81,7 @@
# define ATOMIC_SIZE_INC(var) atomic_inc_ulong(&(var))
# define ATOMIC_SIZE_DEC(var) atomic_dec_ulong(&(var))
# define ATOMIC_SIZE_EXCHANGE(var, val) atomic_swap_ulong(&(var), (val))
-# else
+# define ATOMIC_SIZE_CAS(var, oldval, val) atomic_cas_ulong(&(var), (oldval), (# else
# define ATOMIC_SIZE_ADD(var, val) atomic_add_int(&(var), (val))
# define ATOMIC_SIZE_SUB(var, val) atomic_add_int(&(var), -(val))
# define ATOMIC_SIZE_INC(var) atomic_inc_uint(&(var))

明らかに #else の前後が何か変です。行末が欠けて、かつ、次の行がくっついているように見えます。

Associated revisions

Revision 85186dab
Added by usa (Usaku NAKAMURA) over 5 years ago

  • ruby_atomic.h: fixed merge mistake of r44946. reported by ngoto at [ruby-dev:47980] [Backport #9530]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Revision 45036
Added by usa (Usaku NAKAMURA) over 5 years ago

  • ruby_atomic.h: fixed merge mistake of r44946. reported by ngoto at [ruby-dev:47980] [Backport #9530]

History

Updated by ngoto (Naohisa Goto) over 5 years ago

補足: 上記の122行目は、r45026のruby_atomic.hにおける行番号です。

Updated by usa (Usaku NAKAMURA) over 5 years ago

  • Status changed from Open to Closed
  • % Done changed from 0 to 100

Applied in changeset r45036.


  • ruby_atomic.h: fixed merge mistake of r44946. reported by ngoto at [ruby-dev:47980] [Backport #9530]

Updated by usa (Usaku NAKAMURA) over 5 years ago

報告ありがとうございます。(たぶん)直しました。

Also available in: Atom PDF