X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fbase.h;h=19222a6f5d2ac4ac592ae84797c7044c31d7a1a1;hb=584cbe80152ed3bb8cdbedc41c43d63cd10ca799;hp=45c60802c7454f85c46d5af7aeead636710cac2d;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/base.h b/include/base.h
index 45c60802c..19222a6f5 100644
--- a/include/base.h
+++ b/include/base.h
@@ -26,6 +26,7 @@
 #include <map>
 #include <deque>
 #include <string>
+#include <list>
 
 /** Dummy class to help enforce culls being parent-called up to classbase */
 class CullResult
@@ -121,7 +122,7 @@ class CoreExport usecountbase
 };
 
 template <typename T>
-class CoreExport reference
+class reference
 {
 	T* value;
  public:
@@ -142,7 +143,22 @@ class CoreExport reference
 		if (value && value->refcount_dec())
 			delete value;
 	}
-	inline operator bool() const { return value; }
+
+	inline reference<T>& operator=(T* other)
+	{
+		if (value != other)
+		{
+			if (value && value->refcount_dec())
+				delete value;
+			value = other;
+			if (value)
+				value->refcount_inc();
+		}
+
+		return *this;
+	}
+
+	inline operator bool() const { return (value != NULL); }
 	inline operator T*() const { return value; }
 	inline T* operator->() const { return value; }
 	inline T& operator*() const { return *value; }
@@ -150,7 +166,7 @@ class CoreExport reference
 	inline bool operator>(const reference<T>& other) const { return value > other.value; }
 	static inline void* operator new(size_t, void* m) { return m; }
  private:
-#ifndef WIN32
+#ifndef _WIN32
 	static void* operator new(size_t);
 	static void operator delete(void*);
 #endif
@@ -185,7 +201,7 @@ class CoreExport CoreException : public std::exception
 	 * Actually no, it does nothing. Never mind.
 	 * @throws Nothing!
 	 */
-	virtual ~CoreException() throw() {};
+	virtual ~CoreException() throw() {}
 	/** Returns the reason for the exception.
 	 * The module should probably put something informative here as the user will see this upon failure.
 	 */