atomic 1.1.4-java → 1.1.5-java

data/atomic.gemspec

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 
 # Update these to get proper version and commit history
-new_version = "1.1.4"
-old_version = "1.1.0"
+new_version = "1.1.5"
+old_version = "1.1.4"
 
 git_lines = `git log --oneline #{old_version}...#{new_version}`.lines.map {|str| "* #{str}"}.join
 doc_lines = File.readlines("README.rdoc")

data/ext/atomic_reference.c

@@ -50,7 +50,7 @@ static VALUE ir_compare_and_set(volatile VALUE self, VALUE expect_value, VALUE n
     if (OSAtomicCompareAndSwap64(expect_value, new_value, &DATA_PTR(self))) {
 	return Qtrue;
     }
-#elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100
+#elif HAVE_GCC_CAS
     if (__sync_bool_compare_and_swap(&DATA_PTR(self), expect_value, new_value)) {
 	return Qtrue;
     }

data/ext/extconf.rb

@@ -14,6 +14,14 @@ require 'mkmf'
 extension_name = 'atomic_reference'
 dir_config(extension_name)
 
+try_run(<<CODE) && ($defs << '-DHAVE_GCC_CAS')
+int main() {
+  int i = 1;
+  __sync_bool_compare_and_swap(&i, 1, 4);
+  return (i != 4);
+}
+CODE
+
 case CONFIG["arch"]
 when /mswin32|mingw/
     $CFLAGS += " -march=i686"

metadata

@@ -2,7 +2,7 @@
 name: atomic
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.1.4
+  version: 1.1.5
 platform: java
 authors:
 - Charles Oliver Nutter
@@ -17,16 +17,11 @@ description: |
   = An atomic reference implementation for JRuby, Rubinius, and MRI.
 
 
-  == Changes since 1.1.0
+  == Changes since 1.1.4
 
+  * e269463 Fix #15 by explicitly testing for GCC's CAS.
+  * b8858f9 More formatting for description.
   * a574b34 More formatting for description.
-  * 58d3e34 Convert README to rdoc and try again.
-  * f519385 Attempting to get description to look nice on rubygems.org.
-  * 2c5ab6c Include README and oneline logs in gem description.
-  * 6aeb053 Add @funny-falcon to authors.
-  * aa24d4d Bump version to 1.1.1.
-  * dc327eb Merge pull request #16 from funny-falcon/patch-1
-  * 1b68767 Fix JRUBYREFERENCE8_ALLOCATOR
 
   == Summary
 
@@ -117,7 +112,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/atomic_reference.jar
 - test/test_atomic.rb
 - .gitignore
 - .travis.yml
@@ -148,17 +142,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.24