The timestamp column in SQL should actually be null sometimes, and fixed some valgrind errors with db_sql_live

1 files changed, 16 insertions, 10 deletions

diff --git a/include/base.h b/include/base.h
index 6fb974ec4..3bf9eefef 100644
--- a/include/base.h
+++ b/include/base.h
@@ -73,6 +73,22 @@ class Reference : public ReferenceBase
 			ref->DelReference(this);
 	}
 
+	inline Reference<T>& operator=(const Reference<T> &other)
+	{
+		if (this != &other)
+		{
+			if (*this)
+				this->ref->DelReference(this);
+
+			this->ref = other.ref;
+			this->invalid = other.invalid;
+
+			if (*this)
+				this->ref->AddReference(this);
+		}
+		return *this;
+	}
+
 	/* We explicitly call operator bool here in several places to prevent other
 	 * operators, such operator T*, from being called instead, which will mess
 	 * with any class inheriting from this that overloads this operator.
@@ -105,16 +121,6 @@ class Reference : public ReferenceBase
 		return NULL;
 	}
 
-	inline void operator=(T *newref)
-	{
-		if (operator bool())
-			this->ref->DelReference(this);
-		this->ref = newref;
-		this->invalid = false;
-		if (operator bool())
-			this->ref->AddReference(this);
-	}
-
 	inline bool operator<(const Reference<T> &other) const
 	{
 		return this < &other;