From: Nathan Binkert <binkertn@umich.edu>
Date: Wed, 27 Dec 2006 18:52:25 +0000 (-0800)
Subject: No need to use NULL, just use 0
X-Git-Tag: m5_2.0_beta3~224^2~28
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e90bfafb5b464dacc983c1c513f264d538bd9fd;p=gem5.git

No need to use NULL, just use 0
The result of operator= cannot be an l-value

--HG--
extra : convert_revision : df97a57f466e3498bd5a29638cb9912c7f3e1bd4
---

diff --git a/src/base/refcnt.hh b/src/base/refcnt.hh
index 6672d4a5f..d1663ad72 100644
--- a/src/base/refcnt.hh
+++ b/src/base/refcnt.hh
@@ -28,10 +28,8 @@
  * Authors: Nathan Binkert
  */
 
-#ifndef __REFCNT_HH__
-#define __REFCNT_HH__
-
-#include <stddef.h> //For the NULL macro definition
+#ifndef __BASE_REFCNT_HH__
+#define __BASE_REFCNT_HH__
 
 class RefCounted
 {
@@ -77,7 +75,7 @@ class RefCountingPtr
 
 
   public:
-    RefCountingPtr() : data(NULL) {}
+    RefCountingPtr() : data(0) {}
     RefCountingPtr(T *data) { copy(data); }
     RefCountingPtr(const RefCountingPtr &r) { copy(r.data); }
     ~RefCountingPtr() { del(); }
@@ -90,8 +88,8 @@ class RefCountingPtr
     const T &operator*() const { return *data; }
     const T *get() const { return data; }
 
-    RefCountingPtr &operator=(T *p) { set(p); return *this; }
-    RefCountingPtr &operator=(const RefCountingPtr &r)
+    const RefCountingPtr &operator=(T *p) { set(p); return *this; }
+    const RefCountingPtr &operator=(const RefCountingPtr &r)
     { return operator=(r.data); }
 
     bool operator!() const { return data == 0; }
@@ -122,4 +120,4 @@ template<class T>
 bool operator!=(const T &l, const RefCountingPtr<T> &r)
 { return l != r.get(); }
 
-#endif // __REFCNT_HH__
+#endif // __BASE_REFCNT_HH__