diff options
| author | Michael West <michael.west@ettus.com> | 2013-11-20 12:14:24 -0800 |
|---|---|---|
| committer | Michael West <michael.west@ettus.com> | 2013-11-20 12:14:24 -0800 |
| commit | 6ff935e6955be81f30606d0444a265ea03dc6f5d (patch) | |
| tree | 27745786f543858b99d22de1d87f87da9f905f15 /host/include | |
| parent | 1fe3db82d6d292a186fe26e728dfdf68db4db056 (diff) | |
| parent | 265e94473130ffefc95d4eb67e8d46ce50982be4 (diff) | |
| download | uhd-6ff935e6955be81f30606d0444a265ea03dc6f5d.tar.gz uhd-6ff935e6955be81f30606d0444a265ea03dc6f5d.tar.bz2 uhd-6ff935e6955be81f30606d0444a265ea03dc6f5d.zip | |
Merge remote branch
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/config.hpp | 3 | ||||
| -rw-r--r-- | host/include/uhd/utils/atomic.hpp | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp index 6fd2932cf..619bd0787 100644 --- a/host/include/uhd/config.hpp +++ b/host/include/uhd/config.hpp @@ -55,18 +55,21 @@ typedef ptrdiff_t ssize_t; #define UHD_INLINE __forceinline #define UHD_DEPRECATED __declspec(deprecated) #define UHD_ALIGNED(x) __declspec(align(x)) + #define UHD_UNUSED(x) x #elif defined(__GNUG__) && __GNUG__ >= 4 #define UHD_EXPORT __attribute__((visibility("default"))) #define UHD_IMPORT __attribute__((visibility("default"))) #define UHD_INLINE inline __attribute__((always_inline)) #define UHD_DEPRECATED __attribute__((deprecated)) #define UHD_ALIGNED(x) __attribute__((aligned(x))) + #define UHD_UNUSED(x) x __attribute__((unused)) #else #define UHD_EXPORT #define UHD_IMPORT #define UHD_INLINE inline #define UHD_DEPRECATED #define UHD_ALIGNED(x) + #define UHD_UNUSED(x) x #endif // Define API declaration macro diff --git a/host/include/uhd/utils/atomic.hpp b/host/include/uhd/utils/atomic.hpp index 5f0a056d2..55769d2fd 100644 --- a/host/include/uhd/utils/atomic.hpp +++ b/host/include/uhd/utils/atomic.hpp @@ -78,11 +78,9 @@ namespace uhd{ class UHD_API reusable_barrier{ public: - reusable_barrier():_size (1) {} + reusable_barrier():_size (0) {} - reusable_barrier(const size_t size) { - _size = size; - } + reusable_barrier(const size_t size):_size(size) {} //! Resize the barrier for N threads void resize(const size_t size){ |