From f93ca6eeb64b437b6c77943628726217b807f3c2 Mon Sep 17 00:00:00 2001 From: rfm Date: Thu, 30 May 2024 11:15:19 +0100 Subject: [PATCH] Don't use lazy locks any more --- Source/NSAnimation.m | 6 +++--- Source/NSKeyValueBinding.m | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/NSAnimation.m b/Source/NSAnimation.m index 5165b41698..b60be90c97 100644 --- a/Source/NSAnimation.m +++ b/Source/NSAnimation.m @@ -35,7 +35,7 @@ #import #import #import -#import +#import #import "AppKit/NSAnimation.h" #import "AppKit/NSApplication.h" @@ -418,7 +418,7 @@ - (id) initWithDuration: (NSTimeInterval)duration (BOOL (*)(id,SEL,NSAnimation*)) NULL; _isThreaded = NO; - _isAnimatingLock = [GSLazyRecursiveLock new]; + _isAnimatingLock = [NSRecursiveLock new]; } return self; } @@ -430,7 +430,7 @@ - (id) copyWithZone: (NSZone*)zone c->_progressMarks = GSIArrayCopyWithZone(_progressMarks, zone); c->_animator = nil; c->_isANewAnimatorNeeded = YES; - c->_isAnimatingLock = [GSLazyRecursiveLock new]; + c->_isAnimatingLock = [NSRecursiveLock new]; return c; } diff --git a/Source/NSKeyValueBinding.m b/Source/NSKeyValueBinding.m index 513e2ed4c6..d5b9e2769f 100644 --- a/Source/NSKeyValueBinding.m +++ b/Source/NSKeyValueBinding.m @@ -40,7 +40,7 @@ #import #import #import -#import +#import #import "AppKit/NSKeyValueBinding.h" #import "GSBindingHelpers.h" @@ -145,7 +145,7 @@ + (void) initialize { if (self == [GSKeyValueBinding class]) { - bindingLock = [GSLazyRecursiveLock new]; + bindingLock = [NSRecursiveLock new]; classTable = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks, NSObjectMapValueCallBacks, 128); objectTable = NSCreateMapTable(NSNonRetainedObjectMapKeyCallBacks,