diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-09-09 17:40:38 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-09-09 17:40:38 -0700 |
| commit | f70dd85daa8a6b9e1762c9339532027e40a67018 (patch) | |
| tree | 6274a604f4372ae31fbf06bfb7334a1876e83337 /host/include | |
| parent | 042088a7982ab5f9f1e3628dd7fc24f3618af2cd (diff) | |
| parent | 23cd2754e816f055accf3c3c049476a6668c52a1 (diff) | |
| download | uhd-f70dd85daa8a6b9e1762c9339532027e40a67018.tar.gz uhd-f70dd85daa8a6b9e1762c9339532027e40a67018.tar.bz2 uhd-f70dd85daa8a6b9e1762c9339532027e40a67018.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/utils/soft_register.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/include/uhd/utils/soft_register.hpp b/host/include/uhd/utils/soft_register.hpp index 09a69fce2..22c3a0ff0 100644 --- a/host/include/uhd/utils/soft_register.hpp +++ b/host/include/uhd/utils/soft_register.hpp @@ -95,7 +95,7 @@ namespace soft_reg_field { } template<typename data_t> - UHD_INLINE size_t mask(const soft_reg_field_t field) { + UHD_INLINE data_t mask(const soft_reg_field_t field) { static const data_t ONE = static_cast<data_t>(1); //Behavior for the left shift operation is undefined in C++ //if the shift amount is >= bitwidth of the datatype |