Skip to content
This repository was archived by the owner on Feb 16, 2024. It is now read-only.

Commit aa6186d

Browse files
committed
for UWP fix compilation error
1 parent e9ee597 commit aa6186d

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

Assets/Plugins/UniRx/Scripts/Async/IAwaiter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if (NET_4_6 || NET_STANDARD_2_0)
1+
#if CSHARP_7_OR_LATER
22
#pragma warning disable CS1591
33

44
using System.Runtime.CompilerServices;

Assets/Plugins/UniRx/Scripts/UnityEngineBridge/ReactiveCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.Threading;
3-
#if (NET_4_6 || NET_STANDARD_2_0)
3+
#if CSHARP_7_OR_LATER
44
using UniRx.Async;
55
#endif
66

Assets/Plugins/UniRx/Scripts/UnityEngineBridge/ReactiveProperty.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#if !UniRxLibrary
55
using UnityEngine;
66
#endif
7-
#if (NET_4_6 || NET_STANDARD_2_0)
7+
#if CSHARP_7_OR_LATER
88
using UniRx.Async;
99
#endif
1010

Assets/Scripts/Tests/_AsyncTest.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ namespace UniRx.Tests
2727
public class _AsyncTest
2828
{
2929
#if CSHARP_7_OR_LATER
30+
#if !UNITY_WSA
3031

3132
public struct MyJob : IJob
3233
{
@@ -167,6 +168,7 @@ public async UniTask WaitUntilValueChanged()
167168
diff.Is(11);
168169
}
169170

171+
170172
public async UniTask SwitchTo()
171173
{
172174
var currentThreadId = Thread.CurrentThread.ManagedThreadId;
@@ -221,6 +223,8 @@ public async UniTask AwaitableReactiveCommand()
221223
v.Is(100);
222224
}
223225

226+
227+
224228
IEnumerator ToaruCoroutineEnumerator()
225229
{
226230
yield return null;
@@ -290,3 +294,5 @@ public async Task<string> GetTextAsync(string path)
290294
}
291295

292296
#endif
297+
298+
#endif

0 commit comments

Comments
 (0)