diff options
| author | theraven <theraven@FreeBSD.org> | 2011-12-27 21:36:31 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2011-12-27 21:36:31 +0000 |
| commit | c8ed04c26b6758354853a6bed4629f71d0d01a7d (patch) | |
| tree | 3f47b4acf69328038b73d93b8fa105be369b52c5 /sys/sys/_null.h | |
| parent | 2fadf62dc19d1aac7d5cb336e9585cbaa69fcf80 (diff) | |
| download | FreeBSD-src-c8ed04c26b6758354853a6bed4629f71d0d01a7d.zip FreeBSD-src-c8ed04c26b6758354853a6bed4629f71d0d01a7d.tar.gz | |
Define NULL to nullptr in C++11 mode (not strictly required, but it makes
migrating code to C++11 easier).
Approved by: dim (mentor)
Diffstat (limited to 'sys/sys/_null.h')
| -rw-r--r-- | sys/sys/_null.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/sys/_null.h b/sys/sys/_null.h index ed6804c..92706c6 100644 --- a/sys/sys/_null.h +++ b/sys/sys/_null.h @@ -31,7 +31,9 @@ #if !defined(__cplusplus) #define NULL ((void *)0) #else -#if defined(__GNUG__) && defined(__GNUC__) && __GNUC__ >= 4 +#if __cplusplus >= 201103L +#define NULL nullptr +#elif defined(__GNUG__) && defined(__GNUC__) && __GNUC__ >= 4 #define NULL __null #else #if defined(__LP64__) |
