Skip to content

Replace deprecated bind1st calls #20

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

Open
thomasteisberg wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace deprecated bind1st calls #20

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
6 changes: 3 additions & 3 deletions sdr/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,10 +564,10 @@ int UHD_SAFE_MAIN(int argc, char *argv[]) {

if (phase_dither) {
// Undo phase modulation and divide by num_presums in one go
transform(buff.begin(), buff.end(), buff.begin(), std::bind1st(std::multiplies<complex<float>>(), polar((float) 1.0/num_presums, inversion_phase)));
transform(buff.begin(), buff.end(), buff.begin(), std::bind(std::multiplies<complex<float>>(), polar((float) 1.0/num_presums, inversion_phase), std::placeholders::_1));
} else if (num_presums != 1) {
// Only divide by num_presums
transform(buff.begin(), buff.end(), buff.begin(), std::bind1st(std::multiplies<complex<float>>(), 1.0/num_presums));
transform(buff.begin(), buff.end(), buff.begin(), std::bind(std::multiplies<complex<float>>(), 1.0/num_presums, std::placeholders::_1));
}

// Add to sample_sum
Expand Down Expand Up @@ -712,7 +712,7 @@ void transmit_worker(tx_streamer::sptr& tx_stream, rx_streamer::sptr& rx_stream)
{
// Setup next chirp for modulation
if (phase_dither) {
transform(chirp_unmodulated.begin(), chirp_unmodulated.end(), tx_buff.begin(), std::bind1st(std::multiplies<complex<float>>(), polar((float) 1.0, get_next_phase(true))));
transform(chirp_unmodulated.begin(), chirp_unmodulated.end(), tx_buff.begin(), std::bind(std::multiplies<complex<float>>(), polar((float) 1.0, get_next_phase(true)), std::placeholders::_1));
}

/*
Expand Down