Skip to content

Commit 2dc4870

Browse files
committed
---
yaml --- r: 341741 b: refs/heads/rxwei-patch-1 c: 13c1391 h: refs/heads/master i: 341739: 899f26d
1 parent 9696184 commit 2dc4870

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
10151015
refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
10161016
refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
10171017
refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
1018-
refs/heads/rxwei-patch-1: b0f30c8123414becc6ba24241a66158c97a36452
1018+
refs/heads/rxwei-patch-1: 13c1391138048de009c4c1c89a0c37ca077ad561
10191019
refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
10201020
refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
10211021
refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/stdlib/public/SwiftShims/RefCount.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1496,6 +1496,7 @@ _Static_assert(_Alignof(InlineRefCounts) == _Alignof(__swift_uintptr_t),
14961496
#endif
14971497

14981498
#if defined(_WIN32) && defined(_M_ARM64)
1499+
#if defined(__cplusplus)
14991500
namespace std {
15001501
template <>
15011502
inline void _Atomic_storage<swift::SideTableRefCountBits, 16>::_Unlock() const noexcept {
@@ -1505,5 +1506,6 @@ inline void _Atomic_storage<swift::SideTableRefCountBits, 16>::_Unlock() const n
15051506
}
15061507
}
15071508
#endif
1509+
#endif
15081510

15091511
#endif

0 commit comments

Comments
 (0)