X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fbase.h;h=dcbb2e5c7858c7727e2237cf8b8e1b8db7222b22;hb=711e33b9f8461df55c2fa8e5351769c6e6eb3e0f;hp=45c60802c7454f85c46d5af7aeead636710cac2d;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/base.h b/include/base.h
index 45c60802c..dcbb2e5c7 100644
--- a/include/base.h
+++ b/include/base.h
@@ -20,12 +20,12 @@
  */
 
 
-#ifndef BASE_H
-#define BASE_H
+#pragma once
 
 #include <map>
 #include <deque>
 #include <string>
+#include <list>
 
 /** Dummy class to help enforce culls being parent-called up to classbase */
 class CullResult
@@ -121,7 +121,7 @@ class CoreExport usecountbase
 };
 
 template <typename T>
-class CoreExport reference
+class reference
 {
 	T* value;
  public:
@@ -142,7 +142,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 +165,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
@@ -164,21 +179,23 @@ class CoreExport reference
  */
 class CoreExport CoreException : public std::exception
 {
- public:
+ protected:
 	/** Holds the error message to be displayed
 	 */
 	const std::string err;
 	/** Source of the exception
 	 */
 	const std::string source;
-	/** Default constructor, just uses the error mesage 'Core threw an exception'.
-	 */
-	CoreException() : err("Core threw an exception"), source("The core") {}
+
+ public:
 	/** This constructor can be used to specify an error message before throwing.
+	 * @param message Human readable error message
 	 */
 	CoreException(const std::string &message) : err(message), source("The core") {}
 	/** This constructor can be used to specify an error message before throwing,
 	 * and to specify the source of the exception.
+	 * @param message Human readable error message
+	 * @param src Source of the exception
 	 */
 	CoreException(const std::string &message, const std::string &src) : err(message), source(src) {}
 	/** This destructor solves world hunger, cancels the world debt, and causes the world to end.
@@ -187,17 +204,14 @@ class CoreExport CoreException : public std::exception
 	 */
 	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.
+	 * @return Human readable description of the error
 	 */
-	virtual const char* GetReason()
-	{
-		return err.c_str();
-	}
+	const std::string& GetReason() const { return err; }
 
-	virtual const char* GetSource()
-	{
-		return source.c_str();
-	}
+	/** Returns the source of the exception
+	 * @return Source of the exception
+	 */
+	const std::string& GetSource() const { return source; }
 };
 
 class Module;
@@ -234,10 +248,10 @@ class CoreExport ServiceProvider : public classbase
 	const std::string name;
 	/** Type of service (must match object type) */
 	const ServiceType service;
-	ServiceProvider(Module* Creator, const std::string& Name, ServiceType Type)
-		: creator(Creator), name(Name), service(Type) {}
+	ServiceProvider(Module* Creator, const std::string& Name, ServiceType Type);
 	virtual ~ServiceProvider();
-};
-
 
-#endif
+	/** If called, this ServiceProvider won't be registered automatically
+	 */
+	void DisableAutoRegister();
+};