mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-15 04:30:33 +00:00
possible fix of building error in Ubuntu 12.04
NULL was taken as int instead of null pointer; nullptr resolves the ambiguity
This commit is contained in:
parent
844c33d699
commit
b69e759e45
@ -52,29 +52,29 @@
|
||||
class GNSSBlockInterface
|
||||
{
|
||||
public:
|
||||
virtual ~GNSSBlockInterface()
|
||||
{}
|
||||
virtual std::string role() = 0;
|
||||
virtual std::string implementation() = 0;
|
||||
virtual size_t item_size() = 0;
|
||||
virtual void connect(gr::top_block_sptr top_block) = 0;
|
||||
virtual void disconnect(gr::top_block_sptr top_block) = 0;
|
||||
virtual ~GNSSBlockInterface()
|
||||
{}
|
||||
virtual std::string role() = 0;
|
||||
virtual std::string implementation() = 0;
|
||||
virtual size_t item_size() = 0;
|
||||
virtual void connect(gr::top_block_sptr top_block) = 0;
|
||||
virtual void disconnect(gr::top_block_sptr top_block) = 0;
|
||||
|
||||
virtual gr::basic_block_sptr get_left_block() = 0;
|
||||
virtual gr::basic_block_sptr get_right_block() = 0;
|
||||
virtual gr::basic_block_sptr get_left_block() = 0;
|
||||
virtual gr::basic_block_sptr get_right_block() = 0;
|
||||
|
||||
virtual gr::basic_block_sptr get_left_block(int RF_channel)
|
||||
{
|
||||
assert(RF_channel >= 0);
|
||||
if (RF_channel == 0){}; // avoid unused param warning
|
||||
return NULL; // added to support raw array access (non pure virtual to allow left unimplemented)= 0;
|
||||
}
|
||||
virtual gr::basic_block_sptr get_right_block(int RF_channel)
|
||||
{
|
||||
assert(RF_channel >= 0);
|
||||
if (RF_channel == 0){}; // avoid unused param warning
|
||||
return NULL; // added to support raw array access (non pure virtual to allow left unimplemented)= 0;
|
||||
}
|
||||
virtual gr::basic_block_sptr get_left_block(int RF_channel)
|
||||
{
|
||||
assert(RF_channel >= 0);
|
||||
if (RF_channel == 0){}; // avoid unused param warning
|
||||
return nullptr; // added to support raw array access (non pure virtual to allow left unimplemented)= 0;
|
||||
}
|
||||
virtual gr::basic_block_sptr get_right_block(int RF_channel)
|
||||
{
|
||||
assert(RF_channel >= 0);
|
||||
if (RF_channel == 0){}; // avoid unused param warning
|
||||
return nullptr; // added to support raw array access (non pure virtual to allow left unimplemented)= 0;
|
||||
}
|
||||
};
|
||||
|
||||
#endif /*GNSS_SDR_GNSS_BLOCK_INTERFACE_H_*/
|
||||
|
Loading…
Reference in New Issue
Block a user