diff --git a/libgambatte/src/common/array.h b/libgambatte/src/common/array.h deleted file mode 100644 index cc45e8584a..0000000000 --- a/libgambatte/src/common/array.h +++ /dev/null @@ -1,52 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2008 by Sindre Aamås * - * aamas@stud.ntnu.no * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License version 2 as * - * published by the Free Software Foundation. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License version 2 for more details. * - * * - * You should have received a copy of the GNU General Public License * - * version 2 along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#ifndef ARRAY_H -#define ARRAY_H - -#include -#include "uncopyable.h" - -template -class Array : Uncopyable { - T *a; - std::size_t sz; - -public: - explicit Array(const std::size_t size = 0) : a(size ? new T[size] : 0), sz(size) {} - ~Array() { delete []a; } - void reset(const std::size_t size = 0) { delete []a; a = size ? new T[size] : 0; sz = size; } - std::size_t size() const { return sz; } - T * get() const { return a; } - operator T*() const { return a; } -}; - -template -class ScopedArray : Uncopyable { - T *a_; - -public: - explicit ScopedArray(T *a = 0) : a_(a) {} - ~ScopedArray() { delete []a_; } - void reset(T *a = 0) { delete []a_; a_ = a; } - T * release() { T *a = a_; a_ = 0; return a; } - T * get() const { return a_; } - operator T*() const { return a_; } -}; - -#endif diff --git a/libgambatte/src/common/uncopyable.h b/libgambatte/src/common/uncopyable.h deleted file mode 100644 index 71d77fef33..0000000000 --- a/libgambatte/src/common/uncopyable.h +++ /dev/null @@ -1,29 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2009 by Sindre Aamås * - * aamas@stud.ntnu.no * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License version 2 as * - * published by the Free Software Foundation. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License version 2 for more details. * - * * - * You should have received a copy of the GNU General Public License * - * version 2 along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#ifndef UNCOPYABLE_H -#define UNCOPYABLE_H - -class Uncopyable { - Uncopyable(const Uncopyable&); - Uncopyable& operator=(const Uncopyable&); -public: - Uncopyable() {} -}; - -#endif diff --git a/libgambatte/src/file/stdfile.h b/libgambatte/src/file/stdfile.h deleted file mode 100644 index 72947b11a7..0000000000 --- a/libgambatte/src/file/stdfile.h +++ /dev/null @@ -1,53 +0,0 @@ -/*************************************************************************** -Copyright (C) 2007 by Nach -http://nsrt.edgeemu.com - -Copyright (C) 2007-2011 by Sindre Aamås -aamas@stud.ntnu.no - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License version 2 as -published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License version 2 for more details. - -You should have received a copy of the GNU General Public License -version 2 along with this program; if not, write to the -Free Software Foundation, Inc., -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -***************************************************************************/ -#ifndef GAMBATTE_STD_FILE_H -#define GAMBATTE_STD_FILE_H - -#include "file.h" -#include - -namespace gambatte { - -class StdFile : public File { - std::ifstream stream; - std::size_t fsize; - -public: - explicit StdFile(const char *filename) - : stream(filename, std::ios::in | std::ios::binary), fsize(0) - { - if (stream) { - stream.seekg(0, std::ios::end); - fsize = stream.tellg(); - stream.seekg(0, std::ios::beg); - } - } - - virtual void rewind() { stream.seekg(0, std::ios::beg); } - virtual std::size_t size() const { return fsize; }; - virtual void read(char *buffer, std::size_t amount) { stream.read(buffer, amount); } - virtual bool fail() const { return stream.fail(); } -}; - -} - -#endif diff --git a/output/dll/libgambatte.dll b/output/dll/libgambatte.dll index 5714f1a246..47b5225b7d 100644 Binary files a/output/dll/libgambatte.dll and b/output/dll/libgambatte.dll differ