Skip to content

Commit 4b75547

Browse files
committed
Load native_extension_loader only from synchronization.rb
1 parent 89b6c45 commit 4b75547

File tree

7 files changed

+12
-8
lines changed

7 files changed

+12
-8
lines changed

lib/concurrent/atomic/atomic_boolean.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require 'concurrent/atomic/mutex_atomic_boolean'
2-
require 'concurrent/utility/native_extension_loader'
2+
require 'concurrent/synchronization'
33

44
module Concurrent
55

@@ -48,7 +48,7 @@ module Concurrent
4848
# Explicitly sets the value to false.
4949
#
5050
# @return [Boolean] true is value has changed, otherwise false
51-
51+
5252
###################################################################
5353

5454
# @!macro [new] atomic_boolean_public_api

lib/concurrent/atomic/atomic_fixnum.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require 'concurrent/atomic/mutex_atomic_fixnum'
2-
require 'concurrent/utility/native_extension_loader'
2+
require 'concurrent/synchronization'
33

44
module Concurrent
55

lib/concurrent/atomic/atomic_reference.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'concurrent/utility/native_extension_loader'
1+
require 'concurrent/synchronization'
22
require 'concurrent/utility/engine'
33
require 'concurrent/atomic_reference/concurrent_update_error'
44
require 'concurrent/atomic_reference/mutex_atomic'

lib/concurrent/atomic/semaphore.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require 'concurrent/atomic/mutex_semaphore'
2-
require 'concurrent/utility/native_extension_loader'
2+
require 'concurrent/synchronization'
33

44
module Concurrent
55

lib/concurrent/atomic_reference/jruby.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'concurrent/utility/native_extension_loader'
1+
require 'concurrent/synchronization'
22

33
if defined?(Concurrent::JavaAtomicReference)
44
require 'concurrent/atomic_reference/direct_update'

lib/concurrent/atomic_reference/ruby.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if defined? Concurrent::CAtomicReference
2-
require 'concurrent/utility/native_extension_loader'
2+
require 'concurrent/synchronization'
33
require 'concurrent/atomic_reference/direct_update'
44
require 'concurrent/atomic_reference/numeric_cas_wrapper'
55

lib/concurrent/utility/native_extension_loader.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
require 'concurrent/synchronization/abstract_object' # must be loaded before JRuby extensions
21
require 'concurrent/utility/engine'
32

43
module Concurrent
4+
5+
unless defined? Synchronization::AbstractObject
6+
raise 'native_extension_loader loaded before Synchronization::AbstractObject'
7+
end
8+
59
module Utility
610

711
# @!visibility private

0 commit comments

Comments
 (0)