From 314e62e87ff0481d3171f74751aaf0179e518765 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Tue, 27 Aug 2019 09:12:09 +0000
Subject: [PATCH] Fix warning about nullptr already defined

---
 .svn-revision              | 2 +-
 src/libs/common/SmartPtr.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index eb537fbd..bec6ba54 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-11024
+11025
diff --git a/src/libs/common/SmartPtr.h b/src/libs/common/SmartPtr.h
index e5324c78..62797619 100644
--- a/src/libs/common/SmartPtr.h
+++ b/src/libs/common/SmartPtr.h
@@ -56,7 +56,9 @@
 template<typename T> using CSmartPtr = std::unique_ptr<T>;
 #else
 #	define CSmartPtr std::auto_ptr
-#	define nullptr	 NULL
+#	ifndef nullptr
+#		define nullptr	 NULL
+#	endif
 #endif
 
 #undef HAVE_UNIQUE_PTR
-- 
2.11.4.GIT