[hamradio-commits] [gnss-sdr] 143/149: possible fix of building error in Ubuntu 12.04

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit b69e759e451443647e3d7da367da3d2254f62e70
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Feb 2 22:03:10 2016 +0100

    possible fix of building error in Ubuntu 12.04
    
    NULL was taken as int instead of null pointer; nullptr resolves the
    ambiguity
---
 src/core/interfaces/gnss_block_interface.h | 42 +++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/core/interfaces/gnss_block_interface.h b/src/core/interfaces/gnss_block_interface.h
index bb45902..dd7f155 100644
--- a/src/core/interfaces/gnss_block_interface.h
+++ b/src/core/interfaces/gnss_block_interface.h
@@ -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_*/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git