From 29100937bc00ad3afd576bebd276090a1136b411 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Tue, 16 Feb 2016 21:39:40 +1100
Subject: [PATCH] AP_Common: allow for nullptr_t but not std::move replacement

---
 libraries/AP_Common/missing/cstddef | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/AP_Common/missing/cstddef b/libraries/AP_Common/missing/cstddef
index 72736fc692..f7b86e313d 100644
--- a/libraries/AP_Common/missing/cstddef
+++ b/libraries/AP_Common/missing/cstddef
@@ -6,6 +6,7 @@
 namespace std {
     typedef decltype(nullptr) nullptr_t;
 
+#if defined(HAVE_STD_MOVE) && !HAVE_STD_MOVE
     template< class T > struct remove_reference      {typedef T type;};
     template< class T > struct remove_reference<T&>  {typedef T type;};
     template< class T > struct remove_reference<T&&> {typedef T type;};
@@ -15,5 +16,6 @@ namespace std {
     {
         return static_cast<typename std::remove_reference<T>::type&&>(t);
     }
+#endif
 }
 #endif