diff options
| author | bunnei <bunneidev@gmail.com> | 2016-02-13 21:10:05 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-02-13 21:10:05 -0500 |
| commit | 0d086616d1af239b8e41b246bea3c1ef85fc907f (patch) | |
| tree | 0dc7778532b0e2d1c5acd0224266b8a67d961155 /src/core/hle/service/soc_u.cpp | |
| parent | f1d1049c4fdf51fd382f9afb6b5cd5f104e71b0e (diff) | |
| parent | 6c71858c5c698a718045ba44eda495080417a84b (diff) | |
Merge pull request #1406 from MerryMage/bitfield2
BitField: Make trivially copyable and remove assignment operator.
Diffstat (limited to 'src/core/hle/service/soc_u.cpp')
| -rw-r--r-- | src/core/hle/service/soc_u.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index 822b093f4..e603bf794 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp @@ -178,17 +178,17 @@ struct CTRPollFD { static Events TranslateTo3DS(u32 input_event) { Events ev = {}; if (input_event & POLLIN) - ev.pollin = 1; + ev.pollin.Assign(1); if (input_event & POLLPRI) - ev.pollpri = 1; + ev.pollpri.Assign(1); if (input_event & POLLHUP) - ev.pollhup = 1; + ev.pollhup.Assign(1); if (input_event & POLLERR) - ev.pollerr = 1; + ev.pollerr.Assign(1); if (input_event & POLLOUT) - ev.pollout = 1; + ev.pollout.Assign(1); if (input_event & POLLNVAL) - ev.pollnval = 1; + ev.pollnval.Assign(1); return ev; } |