From baec697c50ceee438247814387414f6acfcb1e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sun, 18 Feb 2018 12:15:25 -0300 Subject: [PATCH] Removed eepp/system/base.hpp --HG-- branch : dev-scenenode --- include/eepp/system/base.hpp | 9 --------- include/eepp/system/clock.hpp | 1 - include/eepp/system/container.hpp | 1 - include/eepp/system/filesystem.hpp | 4 +++- include/eepp/system/inifile.hpp | 2 +- include/eepp/system/iostream.hpp | 3 ++- include/eepp/system/log.hpp | 1 - include/eepp/system/md5.hpp | 2 ++ include/eepp/system/objectloader.hpp | 2 +- include/eepp/system/pack.hpp | 1 - include/eepp/system/pak.hpp | 1 - include/eepp/system/rc4.hpp | 4 +++- include/eepp/system/resourceloader.hpp | 1 - include/eepp/system/resourcemanager.hpp | 3 ++- include/eepp/system/sys.hpp | 2 +- include/eepp/system/thread.hpp | 2 +- include/eepp/system/zip.hpp | 1 - projects/linux/ee.files | 1 - src/eepp/system/iostreammemory.cpp | 1 + src/eepp/system/platform/posix/threadimpl.cpp | 1 + 20 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 include/eepp/system/base.hpp diff --git a/include/eepp/system/base.hpp b/include/eepp/system/base.hpp deleted file mode 100644 index ae340aa86..000000000 --- a/include/eepp/system/base.hpp +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef EE_SYSTEM_BASE -#define EE_SYSTEM_BASE - -#include - -#include -using namespace EE::Math; - -#endif diff --git a/include/eepp/system/clock.hpp b/include/eepp/system/clock.hpp index 35ba44ff1..273b7f635 100644 --- a/include/eepp/system/clock.hpp +++ b/include/eepp/system/clock.hpp @@ -1,7 +1,6 @@ #ifndef EE_SYSTEMCTIMER_H #define EE_SYSTEMCTIMER_H -#include #include namespace EE { namespace System { diff --git a/include/eepp/system/container.hpp b/include/eepp/system/container.hpp index 620bd5ade..553733290 100644 --- a/include/eepp/system/container.hpp +++ b/include/eepp/system/container.hpp @@ -1,7 +1,6 @@ #ifndef EE_SYSTEMTCONTAINER_HPP #define EE_SYSTEMTCONTAINER_HPP -#include #include namespace EE { namespace System { diff --git a/include/eepp/system/filesystem.hpp b/include/eepp/system/filesystem.hpp index ac2681efd..36f799d1b 100644 --- a/include/eepp/system/filesystem.hpp +++ b/include/eepp/system/filesystem.hpp @@ -1,7 +1,9 @@ #ifndef EE_SYSTEM_FILESYSTEM_HPP #define EE_SYSTEM_FILESYSTEM_HPP -#include +#include +#include +#include #include namespace EE { namespace System { diff --git a/include/eepp/system/inifile.hpp b/include/eepp/system/inifile.hpp index 69d64558c..7aebc449a 100755 --- a/include/eepp/system/inifile.hpp +++ b/include/eepp/system/inifile.hpp @@ -16,7 +16,7 @@ #ifndef CINIFILE_H #define CINIFILE_H -#include +#include #include #define MAX_KEYNAME 128 diff --git a/include/eepp/system/iostream.hpp b/include/eepp/system/iostream.hpp index 64f711fa6..de9c36cea 100644 --- a/include/eepp/system/iostream.hpp +++ b/include/eepp/system/iostream.hpp @@ -1,7 +1,8 @@ #ifndef EE_SYSTEMCIOSTREAM_HPP #define EE_SYSTEMCIOSTREAM_HPP -#include +#include +#include namespace EE { typedef std::streamsize ios_size; diff --git a/include/eepp/system/log.hpp b/include/eepp/system/log.hpp index 7c9931d5b..35377255e 100755 --- a/include/eepp/system/log.hpp +++ b/include/eepp/system/log.hpp @@ -2,7 +2,6 @@ #define EECLOG_H #include -#include #include #include #include diff --git a/include/eepp/system/md5.hpp b/include/eepp/system/md5.hpp index 52ba0e603..691fdacbf 100644 --- a/include/eepp/system/md5.hpp +++ b/include/eepp/system/md5.hpp @@ -2,6 +2,8 @@ #define EE_SYSTEM_MD5_HPP #include +#include +#include namespace EE { namespace System { diff --git a/include/eepp/system/objectloader.hpp b/include/eepp/system/objectloader.hpp index 9665a912e..46a67eaf1 100644 --- a/include/eepp/system/objectloader.hpp +++ b/include/eepp/system/objectloader.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMCOBJECTLOADER #define EE_SYSTEMCOBJECTLOADER -#include +#include #include #include diff --git a/include/eepp/system/pack.hpp b/include/eepp/system/pack.hpp index 7493bf0e5..bb371436f 100755 --- a/include/eepp/system/pack.hpp +++ b/include/eepp/system/pack.hpp @@ -1,7 +1,6 @@ #ifndef EE_SYSTEMCPACK_HPP #define EE_SYSTEMCPACK_HPP -#include #include #include #include diff --git a/include/eepp/system/pak.hpp b/include/eepp/system/pak.hpp index 1df4bc93a..670c88d6b 100755 --- a/include/eepp/system/pak.hpp +++ b/include/eepp/system/pak.hpp @@ -1,7 +1,6 @@ #ifndef EE_SYSTEMCPAK_HPP #define EE_SYSTEMCPAK_HPP -#include #include #include diff --git a/include/eepp/system/rc4.hpp b/include/eepp/system/rc4.hpp index 48937d7dd..6c0faa6c3 100755 --- a/include/eepp/system/rc4.hpp +++ b/include/eepp/system/rc4.hpp @@ -1,7 +1,9 @@ #ifndef EE_SYSTEMCRC4_H #define EE_SYSTEMCRC4_H -#include +#include +#include +#include namespace EE { namespace System { diff --git a/include/eepp/system/resourceloader.hpp b/include/eepp/system/resourceloader.hpp index af0988eaf..ca558d24c 100644 --- a/include/eepp/system/resourceloader.hpp +++ b/include/eepp/system/resourceloader.hpp @@ -1,7 +1,6 @@ #ifndef EE_SYSTEMCRESOURCELOADER #define EE_SYSTEMCRESOURCELOADER -#include #include namespace EE { namespace System { diff --git a/include/eepp/system/resourcemanager.hpp b/include/eepp/system/resourcemanager.hpp index 4d5bbee86..07071cd5f 100644 --- a/include/eepp/system/resourcemanager.hpp +++ b/include/eepp/system/resourcemanager.hpp @@ -1,7 +1,8 @@ #ifndef EE_SYSTEMTRESOURCEMANAGER_HPP #define EE_SYSTEMTRESOURCEMANAGER_HPP -#include +#include +#include #include namespace EE { namespace System { diff --git a/include/eepp/system/sys.hpp b/include/eepp/system/sys.hpp index 2840f56e6..e77886f63 100644 --- a/include/eepp/system/sys.hpp +++ b/include/eepp/system/sys.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEM_SYSTEM_HPP #define EE_SYSTEM_SYSTEM_HPP -#include +#include #include namespace EE { namespace System { diff --git a/include/eepp/system/thread.hpp b/include/eepp/system/thread.hpp index 7bdfad325..68a0da530 100755 --- a/include/eepp/system/thread.hpp +++ b/include/eepp/system/thread.hpp @@ -1,8 +1,8 @@ #ifndef EE_SYSTEMCTHREAD_H #define EE_SYSTEMCTHREAD_H -#include #include +#include namespace EE { namespace System { diff --git a/include/eepp/system/zip.hpp b/include/eepp/system/zip.hpp index f5ee4ca9f..2a61fc6ac 100644 --- a/include/eepp/system/zip.hpp +++ b/include/eepp/system/zip.hpp @@ -1,7 +1,6 @@ #ifndef EE_SYSTEMCZIP_HPP #define EE_SYSTEMCZIP_HPP -#include #include struct zip; diff --git a/projects/linux/ee.files b/projects/linux/ee.files index b5ca87160..70aab684b 100644 --- a/projects/linux/ee.files +++ b/projects/linux/ee.files @@ -227,7 +227,6 @@ ../../include/eepp/system/iostreamfile.hpp ../../include/eepp/system/iostream.hpp ../../include/eepp/system/inifile.hpp -../../include/eepp/system/base.hpp ../../src/eepp/system/zip.cpp ../../src/eepp/system/clock.cpp ../../src/eepp/system/thread.cpp diff --git a/src/eepp/system/iostreammemory.cpp b/src/eepp/system/iostreammemory.cpp index 43229b18e..df719f1b4 100644 --- a/src/eepp/system/iostreammemory.cpp +++ b/src/eepp/system/iostreammemory.cpp @@ -1,4 +1,5 @@ #include +#include namespace EE { namespace System { diff --git a/src/eepp/system/platform/posix/threadimpl.cpp b/src/eepp/system/platform/posix/threadimpl.cpp index 477419237..7aefc1ab0 100644 --- a/src/eepp/system/platform/posix/threadimpl.cpp +++ b/src/eepp/system/platform/posix/threadimpl.cpp @@ -1,6 +1,7 @@ #include #include #include +#include namespace EE { namespace System { namespace Platform {