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:
Carles Fernandez 2016-02-02 22:03:10 +01:00
parent 844c33d699
commit b69e759e45
1 changed files with 21 additions and 21 deletions

View File

@ -67,13 +67,13 @@ public:
{
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;
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 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;
}
};