mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +00:00
Code Issues Releases Wiki Activity

fix MacOS ambiguity error

Browse Source
This commit is contained in:
Jim Melton 2021-02-15 17:51:42 -07:00
parent 3b728d9c26
commit 957a13e6ef
No known key found for this signature in database
GPG Key ID: C46392D9AACAB216
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/algorithms/signal_source/adapters/file_source_base.cc
View File

@ -185,14 +185,15 @@ FileSourceBase::FileSourceBase(ConfigurationInterface const* configuration, std:
, ,
is_complex_(false) is_complex_(false)
// apparently, MacOS (LLVM) finds 0UL ambiguous with bool, int64_t, uint64_t, int32_t, int16_t, uint16_t,... float, double
, ,
header_size_(configuration->property(role + ".header_size"s, 0UL)), header_size_(configuration->property(role + ".header_size"s, size_t(0))),
seconds_to_skip_(configuration->property(role + ".seconds_to_skip", 0.0)), seconds_to_skip_(configuration->property(role + ".seconds_to_skip", 0.0)),
repeat_(configuration->property(role + ".repeat"s, false)) repeat_(configuration->property(role + ".repeat"s, false))
, ,
samples_(configuration->property(role + ".samples"s, 0UL)), samples_(configuration->property(role + ".samples"s, uint64_t(0))),
sampling_frequency_(configuration->property(role + ".sampling_frequency"s, 0UL)), sampling_frequency_(configuration->property(role + ".sampling_frequency"s, int64_t(0))),
valve_(), valve_(),
queue_(queue) queue_(queue)

2
src/algorithms/signal_source/adapters/file_source_base.h
View File

@ -157,7 +157,7 @@ private:
// beyond its lifetime. Fortunately, the queue is only used to create the valve, so the // beyond its lifetime. Fortunately, the queue is only used to create the valve, so the
// likelihood of holding a stale pointer is mitigated // likelihood of holding a stale pointer is mitigated
uint64_t samples_; uint64_t samples_;
int64_t sampling_frequency_; int64_t sampling_frequency_; // why is this signed
gnss_shared_ptr<gr::block> valve_; gnss_shared_ptr<gr::block> valve_;
Concurrent_Queue<pmt::pmt_t>* queue_; Concurrent_Queue<pmt::pmt_t>* queue_;