Merge pull request #1230 from SaberUK/insp20+ipcache

[user/henk/code/inspircd.git] / include / base.h

diff --git a/include/base.h b/include/base.h
index 230ed1db4f81f02a35816c849aa07ac19015bd3d..19222a6f5d2ac4ac592ae84797c7044c31d7a1a1 100644 (file)
--- 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:
@@ -157,7 +158,7 @@ class CoreExport reference
                return *this;
        }
 
-       inline operator bool() const { return value; }
+       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; }
@@ -165,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
@@ -200,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.
         */