nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

memory: remove legacy scoped_malloc

Browse Source
This commit is contained in:
Danny Robson 2015-11-11 17:00:00 +11:00
parent 32ca27abdf
commit 6561e46018
5 changed files with 3 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -158,8 +158,6 @@ UTIL_FILES = \
matrix4.cpp \ matrix4.cpp \
matrix.hpp \ matrix.hpp \
matrix.ipp \ matrix.ipp \
memory.cpp \
memory.hpp \
memory/buffer/circular.cpp \ memory/buffer/circular.cpp \
memory/buffer/circular.hpp \ memory/buffer/circular.hpp \
memory/buffer/paged.cpp \ memory/buffer/paged.cpp \

1
io.hpp
View File

@ -18,7 +18,6 @@
#define __UTIL_IO_HPP #define __UTIL_IO_HPP
#include "types.hpp" #include "types.hpp"
#include "memory.hpp"
#include "platform.hpp" #include "platform.hpp"
#include "nocopy.hpp" #include "nocopy.hpp"

17
memory.cpp
View File

@ -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"

46
memory.hpp
View File

@ -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

5
memory/buffer/paged.cpp
View File

@ -17,9 +17,10 @@
#include "./paged.hpp" #include "./paged.hpp"
#include "../system.hpp" #include "../system.hpp"
#include "../../memory.hpp"
#include "../../types/casts.hpp"
#include "../../except.hpp" #include "../../except.hpp"
#include "../../maths.hpp"
#include "../../pointer.hpp"
#include "../../types/casts.hpp"
#include <sys/mman.h> #include <sys/mman.h>