Skip to content

Commit

Permalink
fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Your Name committed Nov 24, 2024
1 parent f4d7118 commit ad524a6
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 18 deletions.
9 changes: 1 addition & 8 deletions src/protocol/MulleObjCRootObject.m
Original file line number Diff line number Diff line change
Expand Up @@ -415,14 +415,7 @@ - (void) mulleRelinquishAccessWithTAOStrategy:(MulleObjCTAOStrategy) strategy
//
- (MulleObjCTAOStrategy) mulleTAOStrategy
{
//
// So this default is MulleObjCTAOKnownThreadSafeMethods, because it doesn't
// break existing code. Known problematic subclasses like
// NSMutableDictionary then should actually reset this to some unsafe tag.
// In a future world where everything is a MulleObject, this would be unsafe
// and autolocking would promote this to ThreadSafe (?)
//
return( MulleObjCTAOKnownThreadSafeMethods);
return( MulleObjCTAOCallerRemovesFromCurrentPool);
}


Expand Down
2 changes: 1 addition & 1 deletion test/tao-mix/default.errors
Original file line number Diff line number Diff line change
@@ -1 +1 @@
the universe is configured for thread affine objects
runtime is compiled for thread affine objects
9 changes: 1 addition & 8 deletions test/tao-thread/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,12 @@ project( tao-thread C)

cmake_minimum_required( VERSION 3.11)

set_source_files_properties( main.m PROPERTIES COMPILE_OPTIONS "-fno-objc-tao")

add_executable( "${PROJECT_NAME}.exe"
main.m
)

if( "${C_COMPILER_NAME}" MATCHES "mulle-cl*")
if( CMAKE_BUILD_TYPE MATCHES "^Debug|^Test")
target_compile_options( "${PROJECT_NAME}.exe" PRIVATE -fobjc-tao)
message( STATUS "TAO enabled via compiler flag")
endif()
endif()

set_source_files_properties( main.m PROPERTIES COMPILE_OPTIONS "-fno-objc-tao")

target_link_libraries( "${PROJECT_NAME}.exe"
${TEST_LIBRARIES}
Expand Down
2 changes: 1 addition & 1 deletion test/tao-thread/default.errors
Original file line number Diff line number Diff line change
@@ -1 +1 @@
the universe is configured for thread affine objects
the runtime is configured for thread affine objects

0 comments on commit ad524a6

Please sign in to comment.