diff options
| author | Adam <adam@sigterm.info> | 2012-10-12 14:50:05 -0700 |
|---|---|---|
| committer | Adam <adam@sigterm.info> | 2012-10-12 14:50:05 -0700 |
| commit | c05ad37bfd03486475889485606ed5cffc7bf5a2 (patch) | |
| tree | fe01825889769500a0f080371a0714aa15505b9a /include/base.h | |
| parent | e496d321efe3e9b27f2f116bd22a05ec44aec564 (diff) | |
| parent | 5b9682275e384635a1fd9f7320cf4d9a604a43b4 (diff) | |
Merge pull request #320 from ChrisTX/insp20+cleanupwin
Windows: In-depth cleanup (see details)
Diffstat (limited to 'include/base.h')
| -rw-r--r-- | include/base.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/base.h b/include/base.h index 230ed1db4..3e868ff22 100644 --- a/include/base.h +++ b/include/base.h @@ -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<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 |