From 6561e46018ad0b76885e58925416c24c69bf1287 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Wed, 11 Nov 2015 17:00:00 +1100
Subject: [PATCH] memory: remove legacy scoped_malloc

---
 Makefile.am             |  2 --
 io.hpp                  |  1 -
 memory.cpp              | 17 ---------------
 memory.hpp              | 46 -----------------------------------------
 memory/buffer/paged.cpp |  5 +++--
 5 files changed, 3 insertions(+), 68 deletions(-)
 delete mode 100644 memory.cpp
 delete mode 100644 memory.hpp

diff --git a/Makefile.am b/Makefile.am
index 07d42611..e99e575b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,8 +158,6 @@ UTIL_FILES   =			\
     matrix4.cpp			\
     matrix.hpp			\
     matrix.ipp			\
-    memory.cpp			\
-    memory.hpp			\
     memory/buffer/circular.cpp	\
     memory/buffer/circular.hpp	\
     memory/buffer/paged.cpp	\
diff --git a/io.hpp b/io.hpp
index 264989a6..95725087 100644
--- a/io.hpp
+++ b/io.hpp
@@ -18,7 +18,6 @@
 #define __UTIL_IO_HPP
 
 #include "types.hpp"
-#include "memory.hpp"
 #include "platform.hpp"
 #include "nocopy.hpp"
 
diff --git a/memory.cpp b/memory.cpp
deleted file mode 100644
index c971e5da..00000000
--- a/memory.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2011 Danny Robson <danny@nerdcruft.net>
- */
-
-#include "memory.hpp"
diff --git a/memory.hpp b/memory.hpp
deleted file mode 100644
index 56b515f0..00000000
--- a/memory.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2011 Danny Robson <danny@nerdcruft.net>
- */
-
-#ifndef __MEMORY_HPP
-#define __MEMORY_HPP
-
-template <typename T>
-class scoped_malloc {
-public:
-    explicit scoped_malloc (T *_data):
-        m_data (_data)
-    { ; }
-
-    scoped_malloc (scoped_malloc &&rhs):
-        m_data (rhs.m_data)
-    {
-        rhs.m_data = nullptr;
-    }
-
-    ~scoped_malloc () {
-        free (m_data);
-    }
-
-          T* get (void)        { return m_data; }
-    const T* get (void) const  { return m_data; }
-
-    bool operator! (void) { return !m_data; }
-
-protected:
-    T* m_data;
-};
-
-#endif
diff --git a/memory/buffer/paged.cpp b/memory/buffer/paged.cpp
index 3bb5db71..0f8a6589 100644
--- a/memory/buffer/paged.cpp
+++ b/memory/buffer/paged.cpp
@@ -17,9 +17,10 @@
 #include "./paged.hpp"
 
 #include "../system.hpp"
-#include "../../memory.hpp"
-#include "../../types/casts.hpp"
 #include "../../except.hpp"
+#include "../../maths.hpp"
+#include "../../pointer.hpp"
+#include "../../types/casts.hpp"
 
 #include <sys/mman.h>