X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fbase.h;h=daff74e5663468be7a092b931978dccf5591f9e1;hb=ff3eef491aa9e107d09d9dd9560ef7715b37b3b3;hp=856cd64c2370a5e5263eaa4a00c52b6e78d41b61;hpb=a59d08fffd3dc8a9850ce34c9928fb6382b9b37f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/base.h b/include/base.h
index 856cd64c2..daff74e56 100644
--- a/include/base.h
+++ b/include/base.h
@@ -76,12 +76,14 @@ class CoreExport interfacebase
  */
 class CoreExport refcountbase
 {
-	unsigned int refcount;
+	mutable unsigned int refcount;
  public:
 	refcountbase();
 	virtual ~refcountbase();
 	inline unsigned int GetReferenceCount() const { return refcount; }
 	friend class reference_base;
+	void* operator new(size_t);
+	void operator delete(void*);
  private:
 	// uncopyable
 	refcountbase(const refcountbase&);
@@ -93,6 +95,7 @@ class CoreExport reference_base
  protected:
 	template<typename T> static inline unsigned int inc(T* v) { return ++(v->refcount); }
 	template<typename T> static inline unsigned int dec(T* v) { return --(v->refcount); }
+
 };
 
 template <typename T>
@@ -102,7 +105,7 @@ class reference : public reference_base
  public:
 	reference() : value(0) { }
 	reference(T* v) : value(v) { if (value) inc(value); }
-	reference(const reference& v) : value(v.value) { if (value) inc(value); }
+	reference(const reference<T>& v) : value(v.value) { if (value) inc(value); }
 	reference<T>& operator=(const reference<T>& other)
 	{
 		if (other.value)
@@ -121,12 +124,17 @@ class reference : public reference_base
 				delete value;
 		}
 	}
-	inline const T* operator->() const { return value; }
-	inline const T& operator*() const { return *value; }
-	inline T* operator->() { return value; }
-	inline T& operator*() { return *value; }
 	inline operator bool() const { return value; }
 	inline operator T*() const { return value; }
+	inline T* operator->() const { return value; }
+	inline T& operator*() const { return *value; }
+	inline bool operator<(const reference<T>& other) const { return value < other.value; }
+	inline bool operator>(const reference<T>& other) const { return value > other.value; }
+	inline bool operator==(const reference<T>& other) const { return value == other.value; }
+	inline bool operator!=(const reference<T>& other) const { return value != other.value; }
+ private:
+	void* operator new(size_t);
+	void operator delete(void*);
 };
 
 /** This class can be used on its own to represent an exception, or derived to represent a module-specific exception.
@@ -174,21 +182,32 @@ class CoreExport CoreException : public std::exception
 	}
 };
 
+class Module;
+
 class CoreExport ModuleException : public CoreException
 {
  public:
-	/** Default constructor, just uses the error mesage 'Module threw an exception'.
-	 */
-	ModuleException() : CoreException("Module threw an exception", "A Module") {}
-
 	/** This constructor can be used to specify an error message before throwing.
 	 */
-	ModuleException(const std::string &message) : CoreException(message, "A Module") {}
-	/** This destructor solves world hunger, cancels the world debt, and causes the world to end.
-	 * Actually no, it does nothing. Never mind.
-	 * @throws Nothing!
-	 */
-	virtual ~ModuleException() throw() {};
+	ModuleException(const std::string &message, Module* me = NULL);
+};
+
+/** Module reference, similar to reference<Module>
+ */
+class CoreExport ModuleRef : public reference_base
+{
+	Module* const value;
+ public:
+	ModuleRef(Module* v);
+	~ModuleRef();
+	inline operator Module*() const { return value; }
+	inline Module* operator->() const { return value; }
+	inline Module& operator*() const { return *value; }
+ private:
+	ModuleRef(const ModuleRef&);
+	void operator=(const ModuleRef&);
+	void* operator new(size_t);
+	void operator delete(void*);
 };
 
 #endif