diff options
| author | Josh Blum <josh@joshknows.com> | 2010-07-06 17:59:11 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-07-06 17:59:11 -0700 |
| commit | cfdc9e7776acd1f2c8100ac3593482753c0dbca5 (patch) | |
| tree | 510d0cd2c3d8aaac57b010e481573dee84abe920 | |
| parent | 01067698803179cf8021d30c881eb16f17b184db (diff) | |
| download | uhd-cfdc9e7776acd1f2c8100ac3593482753c0dbca5.tar.gz uhd-cfdc9e7776acd1f2c8100ac3593482753c0dbca5.tar.bz2 uhd-cfdc9e7776acd1f2c8100ac3593482753c0dbca5.zip | |
uhd: removed some errors and warnings under macosx gcc build
| -rw-r--r-- | host/examples/benchmark_rx_rate.cpp | 4 | ||||
| -rw-r--r-- | host/include/uhd/transport/alignment_buffer.ipp | 2 | ||||
| -rw-r--r-- | host/include/uhd/transport/bounded_buffer.ipp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/host/examples/benchmark_rx_rate.cpp b/host/examples/benchmark_rx_rate.cpp index 6984d7eff..a913261eb 100644 --- a/host/examples/benchmark_rx_rate.cpp +++ b/host/examples/benchmark_rx_rate.cpp @@ -82,7 +82,9 @@ static inline void test_device( &buff.front(), buff.size(), md, uhd::io_type_t::COMPLEX_FLOAT32, uhd::device::RECV_MODE_ONE_PACKET - )); + )){ + /* NOP */ + }; //print a summary std::cout << std::endl; //go to newline, recv may spew SXSYSZ... diff --git a/host/include/uhd/transport/alignment_buffer.ipp b/host/include/uhd/transport/alignment_buffer.ipp index f89f2886e..ed7cfd26c 100644 --- a/host/include/uhd/transport/alignment_buffer.ipp +++ b/host/include/uhd/transport/alignment_buffer.ipp @@ -130,7 +130,7 @@ namespace uhd{ namespace transport{ template <typename elem_type, typename seq_type> typename alignment_buffer<elem_type, seq_type>::sptr alignment_buffer<elem_type, seq_type>::make(size_t capacity, size_t width){ - return alignment_buffer<elem_type, seq_type>::sptr( + return typename alignment_buffer<elem_type, seq_type>::sptr( new alignment_buffer_impl<elem_type, seq_type>(capacity, width) ); } diff --git a/host/include/uhd/transport/bounded_buffer.ipp b/host/include/uhd/transport/bounded_buffer.ipp index 6885b357d..e106e229e 100644 --- a/host/include/uhd/transport/bounded_buffer.ipp +++ b/host/include/uhd/transport/bounded_buffer.ipp @@ -104,7 +104,7 @@ namespace uhd{ namespace transport{ template <typename elem_type> typename bounded_buffer<elem_type>::sptr bounded_buffer<elem_type>::make(size_t capacity){ - return bounded_buffer<elem_type>::sptr(new bounded_buffer_impl<elem_type>(capacity)); + return typename bounded_buffer<elem_type>::sptr(new bounded_buffer_impl<elem_type>(capacity)); } }} //namespace |