X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fbase.h;h=117ffab762c2317d09154138353652553caf8b5a;hb=153179b574dccd6df9c5c5f3e68f3c1725e26843;hp=230ed1db4f81f02a35816c849aa07ac19015bd3d;hpb=35ce47718b6021115c9b12e7e63a7daf8bb4a900;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/base.h b/include/base.h index 230ed1db4..117ffab76 100644 --- a/include/base.h +++ b/include/base.h @@ -20,12 +20,12 @@ */ -#ifndef BASE_H -#define BASE_H +#pragma once #include #include #include +#include /** Dummy class to help enforce culls being parent-called up to classbase */ class CullResult @@ -157,7 +157,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 +165,7 @@ class CoreExport reference inline bool operator>(const reference& 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 @@ -254,5 +254,3 @@ class CoreExport ServiceProvider : public classbase virtual ~ServiceProvider(); }; - -#endif