libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove cyclic include

This commit is contained in:
Jack Andersen 2018-08-09 20:18:42 -10:00
parent d2dbd99ad6
commit 075747c418
7 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/athena/Dir.hpp
View File

@ -3,6 +3,7 @@
#include "athena/FileInfo.hpp" #include "athena/FileInfo.hpp"
#include <cstdio> #include <cstdio>
#include <vector>
#if _WIN32 #if _WIN32
typedef int mode_t; typedef int mode_t;

1
include/athena/Global.hpp
View File

@ -3,7 +3,6 @@
#include <iostream> #include <iostream>
#include "athena/Types.hpp" #include "athena/Types.hpp"
#include "athena/Utility.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4996) #pragma warning(disable : 4996)

1
include/athena/IStreamReader.hpp
View File

@ -4,6 +4,7 @@
#include <memory> #include <memory>
#include <functional> #include <functional>
#include "utf8proc.h" #include "utf8proc.h"
#include "Utility.hpp"
#include "IStream.hpp" #include "IStream.hpp"
namespace athena::io namespace athena::io

2
include/athena/IStreamWriter.hpp
View File

@ -3,7 +3,9 @@
#include "utf8proc.h" #include "utf8proc.h"
#include "IStream.hpp" #include "IStream.hpp"
#include "Utility.hpp"
#include <memory> #include <memory>
#include <vector>
namespace athena::io namespace athena::io
{ {

2
include/athena/Utility.hpp
View File

@ -13,6 +13,8 @@ namespace athena::utility
{ {
inline bool isEmpty(atInt8* buf, atUint32 size) {return !memcmp(buf, buf + 1, size - 1);} inline bool isEmpty(atInt8* buf, atUint32 size) {return !memcmp(buf, buf + 1, size - 1);}
constexpr bool isSystemBigEndian() {return __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__;} constexpr bool isSystemBigEndian() {return __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__;}
inline constexpr ::athena::Endian SystemEndian = isSystemBigEndian() ? Big : Little;
inline constexpr ::athena::Endian NotSystemEndian = isSystemBigEndian() ? Little : Big;
inline atInt16 swap16(atInt16 val) inline atInt16 swap16(atInt16 val)
{ {

1
src/athena/Dir.cpp
View File

@ -4,6 +4,7 @@
#include <limits.h> #include <limits.h>
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#include <cinttypes> #include <cinttypes>
#include "athena/Utility.hpp"
#ifndef _WIN32 #ifndef _WIN32
#include <dirent.h> #include <dirent.h>

1
src/athena/Global.cpp
View File

@ -1,4 +1,5 @@
#include "athena/Global.hpp" #include "athena/Global.hpp"
#include "athena/Utility.hpp"
#include <cstdio> #include <cstdio>
#include <cstdarg> #include <cstdarg>
#include <cstdlib> #include <cstdlib>