From df1b9daeaf8cf7a37f5ae9cad30b80d77d7bdc51 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 14 Apr 2015 01:12:00 +0100
Subject: [PATCH] add move/forward and more traits

---
 octa/traits.h | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 octa/types.h  |  2 ++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/octa/traits.h b/octa/traits.h
index 8c541a4..3dd4cb6 100644
--- a/octa/traits.h
+++ b/octa/traits.h
@@ -44,7 +44,7 @@ namespace octa {
 
     template<typename T, T val>
     struct IntegralConstant {
-        static const T value = val;
+        static constexpr const T value = val;
 
         typedef T value_type;
         typedef IntegralConstant<T, val> type;
@@ -53,7 +53,7 @@ namespace octa {
     typedef IntegralConstant<bool, true>  true_t;
     typedef IntegralConstant<bool, false> false_t;
 
-    template<typename T, T val> const T IntegralConstant<T, val>::value;
+    template<typename T, T val> constexpr const T IntegralConstant<T, val>::value;
 
     /* is integer */
 
@@ -100,6 +100,27 @@ namespace octa {
     template<typename T>
     struct IsPointer: IsPointerBase<typename RemoveConstVolatile<T>::type> {};
 
+    /* is pointer to member function */
+
+    template<typename  > struct IsMemberPointerBase: false_t {};
+    template<typename T, typename U>
+    struct IsMemberPointerBase<T U::*>:  true_t {};
+
+    template<typename T>
+    struct IsMemberPointer: IsMemberPointerBase<
+        typename RemoveConstVolatile<T>::type
+    > {};
+
+    /* is null pointer */
+
+    template<typename> struct IsNullPointerBase           : false_t {};
+    template<        > struct IsNullPointerBase<nullptr_t>:  true_t {};
+
+    template<typename T>
+    struct IsNullPointer: IsNullPointerBase<
+        typename RemoveConstVolatile<T>::type
+    > {};
+
     /* is POD: currently wrong */
 
     template<typename T> struct IsPOD: IntegralConstant<bool,
@@ -144,6 +165,28 @@ namespace octa {
     template<typename            > struct IsArray      : false_t {};
     template<typename T          > struct IsArray<T[] >:  true_t {};
     template<typename T, size_t N> struct IsArray<T[N]>:  true_t {};
+
+    /* move */
+
+    template<typename T>
+    static inline constexpr typename RemoveReference<T>::type &&
+    move(T &&v) noexcept {
+        return (typename RemoveReference<T>::type &&)v;
+    }
+
+    /* forward */
+
+    template<typename T>
+    static inline constexpr T &&
+    forward(typename RemoveReference<T>::type &v) noexcept {
+        return (T &&)v;
+    }
+
+    template<typename T>
+    static inline constexpr T &&
+    forward(typename RemoveReference<T>::type &&v) noexcept {
+        return (T &&)v;
+    }
 }
 
 #endif
\ No newline at end of file
diff --git a/octa/types.h b/octa/types.h
index f12acf9..4794b0d 100644
--- a/octa/types.h
+++ b/octa/types.h
@@ -18,6 +18,8 @@ namespace octa {
     typedef long long llong;
 
     typedef long double ldouble;
+
+    typedef decltype(nullptr) nullptr_t;
 }
 
 #endif
\ No newline at end of file