From 952472da5b9b583ee19b94dc563bdfb540170a03 Mon Sep 17 00:00:00 2001
From: jwellbelove <github@wellbelove.co.uk>
Date: Mon, 8 Dec 2014 20:26:34 +0000
Subject: [PATCH] Changed conditional macros

---
 nullptr.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nullptr.h b/nullptr.h
index b138646d..dc214c0b 100644
--- a/nullptr.h
+++ b/nullptr.h
@@ -33,7 +33,7 @@ SOFTWARE.
 /// A definition of nullptr for compilers that don't support it as standard.
 ///\ingroup utilities
 
-#if defined(_MSC_VER) && (_MSC_VER < 1600)
+#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(COMPILER_KEIL) || defined(COMPILER_IAR)
 namespace std
 {
   //*****************************************************************************
@@ -46,14 +46,14 @@ namespace std
 
     // Convertible to any type of null non-member pointer.
     template<class T>
-    inline operator T*() const
+    operator T*() const
     {
       return 0;
     }
 
     // Or any type of null member pointer.
     template<class C, class T>
-    inline operator T C::*() const
+    operator T C::*() const
     {
       return 0;
     }
@@ -81,14 +81,14 @@ public:
 
   // Convertible to any type of null non-member pointer.
   template<class T>
-  inline operator T*() const
+  operator T*() const
   {
     return 0;
   }
 
   // Or any type of null member pointer.
   template<class C, class T>
-  inline operator T C::*() const
+  operator T C::*() const
   {
     return 0;
   }