mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-14 20:20:35 +00:00
Merge branch 'orlando017-next' into next
This commit is contained in:
commit
7084d4ceee
@ -32,8 +32,6 @@ namespace own = std;
|
|||||||
namespace own = gsl;
|
namespace own = gsl;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
using google::LogMessage;
|
|
||||||
|
|
||||||
BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition(
|
BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition(
|
||||||
const ConfigurationInterface* configuration,
|
const ConfigurationInterface* configuration,
|
||||||
const std::string& role,
|
const std::string& role,
|
||||||
|
@ -29,8 +29,6 @@
|
|||||||
#include <glog/logging.h>
|
#include <glog/logging.h>
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
using google::LogMessage;
|
|
||||||
|
|
||||||
BeidouB3iDllPllTracking::BeidouB3iDllPllTracking(
|
BeidouB3iDllPllTracking::BeidouB3iDllPllTracking(
|
||||||
const ConfigurationInterface* configuration, const std::string& role,
|
const ConfigurationInterface* configuration, const std::string& role,
|
||||||
unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
|
unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
|
||||||
|
Loading…
Reference in New Issue
Block a user