mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 20:20:35 +00:00
Code Issues Releases Wiki Activity

possible fix of building error in Ubuntu 12.04

Browse Source 
NULL was taken as int instead of null pointer; nullptr resolves the
ambiguity
This commit is contained in:
Carles Fernandez 2016-02-02 22:03:10 +01:00
parent 844c33d699
commit b69e759e45
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/core/interfaces/gnss_block_interface.h
View File

@ -52,29 +52,29 @@
class GNSSBlockInterface class GNSSBlockInterface
{ {
public: public:
virtual ~GNSSBlockInterface() virtual ~GNSSBlockInterface()
{} {}
virtual std::string role() = 0; virtual std::string role() = 0;
virtual std::string implementation() = 0; virtual std::string implementation() = 0;
virtual size_t item_size() = 0; virtual size_t item_size() = 0;
virtual void connect(gr::top_block_sptr top_block) = 0; virtual void connect(gr::top_block_sptr top_block) = 0;
virtual void disconnect(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_left_block() = 0;
virtual gr::basic_block_sptr get_right_block() = 0; virtual gr::basic_block_sptr get_right_block() = 0;
virtual gr::basic_block_sptr get_left_block(int RF_channel) virtual gr::basic_block_sptr get_left_block(int RF_channel)
{ {
assert(RF_channel >= 0); assert(RF_channel >= 0);
if (RF_channel == 0){}; // avoid unused param warning if (RF_channel == 0){}; // avoid unused param warning
return NULL; // added to support raw array access (non pure virtual to allow left unimplemented)= 0; 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) virtual gr::basic_block_sptr get_right_block(int RF_channel)
{ {
assert(RF_channel >= 0); assert(RF_channel >= 0);
if (RF_channel == 0){}; // avoid unused param warning if (RF_channel == 0){}; // avoid unused param warning
return NULL; // added to support raw array access (non pure virtual to allow left unimplemented)= 0; return nullptr; // added to support raw array access (non pure virtual to allow left unimplemented)= 0;
} }
}; };
#endif /*GNSS_SDR_GNSS_BLOCK_INTERFACE_H_*/ #endif /*GNSS_SDR_GNSS_BLOCK_INTERFACE_H_*/