Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes for osx build #15

Open
wants to merge 1 commit into
base: maint-3.10
Choose a base branch
from
Open

fixes for osx build #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ endif(APPLE)
# Find gnuradio build dependencies
########################################################################
find_package(Doxygen)
find_package(Boost REQUIRED chrono filesystem)
find_package(Boost REQUIRED chrono filesystem unit_test_framework)
find_package(gnuradio-pdu_utils REQUIRED)

# ##############################################################################
Expand Down
8 changes: 4 additions & 4 deletions lib/block_buffer_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ int block_buffer_impl::general_work(int noutput_items,

// read as much as we can into the current buffer
size_t to_read =
std::min((size_t)(ninput_items[0] - in_idx), d_nsamples - d_read_idx);
std::min<size_t>((size_t)(ninput_items[0] - in_idx), d_nsamples - d_read_idx);


// update current rate
Expand Down Expand Up @@ -313,8 +313,8 @@ int block_buffer_impl::general_work(int noutput_items,
int64_t numsamples_skipped =
(d_buf[d_writing].abs_read_idx == 0)
? 0
: std::max(d_buf[d_writing].abs_read_idx - d_last_abs_read_idx -
d_nsamples,
: std::max<unsigned long long>(d_buf[d_writing].abs_read_idx -
d_last_abs_read_idx - d_nsamples,
0lu);

// if there's not already an rx_time tag, and some samples were skipped,
Expand Down Expand Up @@ -352,7 +352,7 @@ int block_buffer_impl::general_work(int noutput_items,
}

// write as much as we can from the current buffer
size_t to_write = std::min((size_t)(noutput_items - d_nreserved - out_idx),
size_t to_write = std::min<size_t>((size_t)(noutput_items - d_nreserved - out_idx),
d_nsamples - d_write_idx);

// write from buffer
Expand Down
2 changes: 1 addition & 1 deletion lib/vita49_tcp_msg_source_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <gnuradio/io_signature.h>
#include <gnuradio/sandia_utils/constants.h>
#include <arpa/inet.h>
#include <endian.h>
#include <sys/types.h> // cross platform include for endian.h

namespace gr
{
Expand Down