Merge pull request #2969

95171614 Remove is_pod trait, and replace with is_standard_layout requirement (Lee Clagett)

1 files changed, 6 insertions, 10 deletions

diff --git a/contrib/epee/include/memwipe.h b/contrib/epee/include/memwipe.h
index 6e50944e6..0d8f491b7 100644
--- a/contrib/epee/include/memwipe.h
+++ b/contrib/epee/include/memwipe.h
@@ -67,18 +67,14 @@ namespace tools {
     }
   };
 
+  template<typename T>
+  T& unwrap(scrubbed<T>& src) { return src; }
+
+  template<typename T>
+  const T& unwrap(scrubbed<T> const& src) { return src; }
+
   template <class T, size_t N>
   using scrubbed_arr = scrubbed<std::array<T, N>>;
 } // namespace tools
 
-// Partial specialization for std::is_pod<tools::scrubbed<T>> so that it can
-// pretend to be the containted type in those contexts.
-namespace std
-{
-  template<class t_scrubbee>
-  struct is_pod<tools::scrubbed<t_scrubbee>> {
-    static const bool value = is_pod<t_scrubbee>::value;
-  };
-}
-
 #endif // __cplusplus