Merge pull request #70 from Shawn-Smith/insp20+chancreatefix

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

diff --git a/include/base.h b/include/base.h
index 7926779ebd0ea21508ccc7d339da130cc2200eb7..3f70f0195663fb0028c9ee65cea69b10e95d3ea7 100644 (file)
--- a/include/base.h
+++ b/include/base.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __BASE_H__
-#define __BASE_H__
+#ifndef BASE_H
+#define BASE_H
 
 #include <map>
 #include <deque>
@@ -112,7 +112,7 @@ class CoreExport usecountbase
 };
 
 template <typename T>
-class reference
+class CoreExport reference
 {
        T* value;
  public:
@@ -141,8 +141,10 @@ class 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
        static void* operator new(size_t);
        static void operator delete(void*);
+#endif
 };
 
 /** This class can be used on its own to represent an exception, or derived to represent a module-specific exception.
@@ -189,6 +191,7 @@ class CoreExport CoreException : public std::exception
        }
 };
 
+class Module;
 class CoreExport ModuleException : public CoreException
 {
  public: