diff options
| author |   Martin Braun <martin.braun@ettus.com> | 2019-05-22 13:49:33 -0700 |
|---|---|---|
| committer |   michael-west <michael.west@ettus.com> | 2019-06-03 18:18:04 -0700 |
| commit | 5af0216a365b7e3190f2762c38d588e1384cf4a8 (patch) | |
| tree | 6cf179d910b79bf8b6b526857e05df27165d4f9a | |
| parent | cores: Use NSDMI consistently in ?x_dsp_core_3000.* (diff) | |
| download | uhd-5af0216a365b7e3190f2762c38d588e1384cf4a8.tar.xz uhd-5af0216a365b7e3190f2762c38d588e1384cf4a8.zip | |
tests: Fix mock_ctrl_iface for 32-bit MSVC
Widening and narrowing of bitwidths causes errors on this platform
without explicit casts.
| -rw-r--r-- | host/tests/common/mock_ctrl_iface_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/tests/common/mock_ctrl_iface_impl.cpp b/host/tests/common/mock_ctrl_iface_impl.cpp index e8560ad9e..af32637df 100644 --- a/host/tests/common/mock_ctrl_iface_impl.cpp +++ b/host/tests/common/mock_ctrl_iface_impl.cpp @@ -28,8 +28,8 @@ uint64_t mock_ctrl_iface_impl::send_cmd_pkt(const size_t addr, case uhd::rfnoc::SR_READBACK_REG_USER: return 0x0123456789ABCDEF; case uhd::rfnoc::SR_READBACK_COMPAT: - return uhd::rfnoc::NOC_SHELL_COMPAT_MAJOR << 32 - | uhd::rfnoc::NOC_SHELL_COMPAT_MINOR; + return uint64_t(uhd::rfnoc::NOC_SHELL_COMPAT_MAJOR) << 32 + | uint64_t(uhd::rfnoc::NOC_SHELL_COMPAT_MINOR); default: return 0; } |