Skip to content

Commit

Permalink
Fix an error when compiling a watchOS Simulator target not supporting…
Browse files Browse the repository at this point in the history
… Thread-local storage. (#5188)
  • Loading branch information
dianaafanador3 authored Feb 8, 2022
1 parent 2ea7baa commit e95ba38
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* Asynchronous writes did not work with queue-confined Realms (since v11.8.0).
* Releasing all references to a Realm while an asynchronous write was in progress would sometimes result in use-after-frees (since v11.8.0).
* Throwing exceptions from asynchronous write callbacks would result in crashes or the Realm being in an invalid state (since v11.8.0).
* Fix an error when compiling a watchOS Simulator target not supporting Thread-local storage ([#7623](https://github.com/realm/realm-swift/issues/7623), since v11.7.0)

### Breaking changes
* Renamed SubscriptionSet::State::Superceded -> Superseded to correct typo.
Expand Down
2 changes: 1 addition & 1 deletion src/realm/impl/simulated_failure.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ bool SimulatedFailure::do_check_trigger(FailureType failure_type) noexcept
return false;
}

#if REALM_ARCHITECTURE_X86_32 && REALM_IOS
#if (REALM_ARCHITECTURE_X86_32 && REALM_IOS) || (REALM_ARCHITECTURE_X86_64 && REALM_WATCHOS)
bool (*s_mmap_predicate)(size_t);
#else
thread_local bool (*s_mmap_predicate)(size_t);
Expand Down

0 comments on commit e95ba38

Please sign in to comment.