From 8b2b58b1e476fdf27f03427b10ac1b6caa5c2033 Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Tue, 20 Jun 2017 10:24:52 +0200
Subject: [PATCH] Make NULL a nullptr var and deprecate it.

---
 core/base/inc/RtypesCore.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/base/inc/RtypesCore.h b/core/base/inc/RtypesCore.h
index f0e236e37031d..efd3100504c5b 100644
--- a/core/base/inc/RtypesCore.h
+++ b/core/base/inc/RtypesCore.h
@@ -85,7 +85,8 @@ typedef float          Size_t;      //Attribute size (float)
 //---- constants ---------------------------------------------------------------
 
 #ifndef NULL
-#define NULL 0
+constexpr const auto R__DEPRECATED(6,12, "Please #include <cstddef> instead of relying on ROOT's NULL")
+   NULL = nullptr;
 #endif
 
 const Bool_t kTRUE  = true;