Move standard stuff to utility and type_traits

So I can stop hunting for things like this. I also planned to use these in user space (cpputil.hh isn't user space friendly), though didn't wind up doing that.

Move standard stuff to utility and type_traits
71917ae5 · Austin Clements · b5cdc429 · 71917ae5 · 71917ae5 · 71917ae5
--- a/include/cpputil.hh
+++ b/include/cpputil.hh
 #pragma once
-template<class A, class B>
+#include <type_traits>
-class pair {
+#include <utility>
- public:
-  typedef A first_type;
-  typedef B second_type;
-  A first;
-  B second;
-  pair(const pair&) = default;
-  pair(pair&&) = default;
-  constexpr pair() : first(), second() {}
-  pair(const A &a, const B &b) : first(a), second(b) {}
-  bool operator==(const pair<A, B> &other) {
+using std::pair;
-    return first == other.first && second == other.second;
+using std::make_pair;
-  }
-};
 template<int N>
 class strbuf {
@@ -33,13 +20,6 @@ class strbuf {
  }
 };
-template<class A, class B>
-pair<A, B>
-make_pair(const A &a, const B &b)
-{
-  return pair<A, B>(a, b);
-}
 class scoped_acquire {
 private:
  spinlock *_l;
@@ -54,25 +34,6 @@ class scoped_acquire {
 class retryable {};
 namespace std {
-  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; };
-  template<class T>
-  typename remove_reference<T>::type&&
-  move(T&& a)
-  {
-    return static_cast<typename remove_reference<T>::type&&>(a);
-  }
  struct ostream { int next_width; };
  extern ostream cout;

--- a/stdinc/type_traits
+++ b/stdinc/type_traits
+// -*- c++ -*-
+#pragma once
+namespace std {
+  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; };
+}
--- a/stdinc/utility
+++ b/stdinc/utility
+// -*- c++ -*-
+#pragma once
+#include <type_traits>
+namespace std {
+  template<class T>
+  typename remove_reference<T>::type&&
+  move(T&& a)
+  {
+    return static_cast<typename remove_reference<T>::type&&>(a);
+  }
+  template<class A, class B>
+  struct pair {
+    typedef A first_type;
+    typedef B second_type;
+    A first;
+    B second;
+    pair(const pair&) = default;
+    pair(pair&&) = default;
+    constexpr pair() : first(), second() {}
+    pair(const A &a, const B &b) : first(a), second(b) {}
+    bool operator==(const pair<A, B> &other) {
+      return first == other.first && second == other.second;
+    }
+  };
+  template<class A, class B>
+  pair<A, B>
+  make_pair(const A &a, const B &b)
+  {
+    return pair<A, B>(a, b);
+  }
+}