Merge pull request #51 from lioncash/include

General: Include headers that are necessary

include/LZ77/LZType10.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "LZBase.hpp"
+#include "LZ77/LZBase.hpp"
 
 class LZType10 : public LZBase {
 public:

include/LZ77/LZType11.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "LZBase.hpp"
+#include "LZ77/LZBase.hpp"
 
 class LZType11 : public LZBase {
 public:

include/athena/Checksums.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "athena/Global.hpp"
+#include "athena/Types.hpp"
 
 namespace athena::checksums {
 atUint64 crc64(const atUint8* data, atUint64 length, atUint64 seed = 0xFFFFFFFFFFFFFFFF,

include/athena/Compression.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "athena/Global.hpp"
+#include "athena/Types.hpp"
 
 namespace athena::io::Compression {
 // Zlib compression

include/athena/DNA.hpp

@@ -6,12 +6,16 @@
  * Any changes to the types or namespacing must be reflected in 'atdna/main.cpp'
  */
 
-#include "Global.hpp"
-#include "IStreamReader.hpp"
-#include "IStreamWriter.hpp"
-#include "DNAOp.hpp"
-#include <vector>
 #include <memory>
+#include <string>
+#include <vector>
+
+#include <sys/types.h>
+
+#include "athena/DNAOp.hpp"
+#include "athena/Global.hpp"
+#include "athena/IStreamReader.hpp"
+#include "athena/IStreamWriter.hpp"
 
 namespace athena::io {
 

include/athena/DNAOp.hpp

@@ -1,11 +1,16 @@
 #pragma once
 
-#include "IStreamReader.hpp"
+#include <cstddef>
-#include "IStreamWriter.hpp"
+#include <cstdint>
-#include "YAMLDocReader.hpp"
+#include <string>
-#include "YAMLDocWriter.hpp"
-#include "ChecksumsLiterals.hpp"
 #include <type_traits>
+#include <vector>
+
+#include "athena/ChecksumsLiterals.hpp"
+#include "athena/IStreamReader.hpp"
+#include "athena/IStreamWriter.hpp"
+#include "athena/YAMLDocReader.hpp"
+#include "athena/YAMLDocWriter.hpp"
 
 namespace athena::io {
 

include/athena/DNAYaml.hpp

@@ -1,10 +1,13 @@
 #pragma once
 
-#include "YAMLDocReader.hpp"
+#include <string>
-#include "YAMLDocWriter.hpp"
+#include <type_traits>
-#include "DNA.hpp"
+
-#include "FileReader.hpp"
+#include "athena/DNA.hpp"
-#include "FileWriter.hpp"
+#include "athena/FileReader.hpp"
+#include "athena/FileWriter.hpp"
+#include "athena/YAMLDocReader.hpp"
+#include "athena/YAMLDocWriter.hpp"
 
 namespace athena::io {
 

include/athena/Dir.hpp

@@ -1,11 +1,9 @@
 #pragma once
 
-#include "athena/FileInfo.hpp"
+#include <string>
-#include <cstdio>
-#include <vector>
 
 #if _WIN32
-typedef int mode_t;
+using mode_t = int;
 #endif
 
 namespace athena {
@@ -19,8 +17,6 @@ public:
   bool isDir() const;
   static bool isDir(std::string_view dir) { return Dir(dir).isDir(); }
 
-  std::vector<FileInfo> files() const;
-
   bool cd(std::string_view path);
   bool rm(std::string_view path);
   bool touch();

include/athena/FileInfo.hpp

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "athena/Global.hpp"
+#include "athena/Types.hpp"
 
 namespace athena {
 class FileInfo {

include/athena/FileReader.hpp

@@ -9,9 +9,11 @@
 #include <cstdio>
 #endif
 
-#include <string>
 #include <memory>
+#include <string>
+
 #include "athena/IStreamReader.hpp"
+#include "athena/Types.hpp"
 
 namespace athena::io {
 class FileReader : public IStreamReader {

include/athena/FileWriter.hpp

@@ -8,7 +8,9 @@
 #else
 #include <cstdio>
 #endif
+
 #include "athena/IStreamWriter.hpp"
+#include "athena/Types.hpp"
 
 namespace athena::io {
 class FileWriter : public IStreamWriter {

include/athena/IStream.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Global.hpp"
+#include "athena/Global.hpp"
 
 namespace athena::io {
 std::ostream& operator<<(std::ostream& os, Endian& endian);

include/athena/IStreamReader.hpp

@@ -1,10 +1,12 @@
 #pragma once
 
-#include <memory>
 #include <functional>
-#include "utf8proc.h"
+#include <memory>
-#include "Utility.hpp"
+#include <type_traits>
-#include "IStream.hpp"
+#include <vector>
+
+#include "athena/IStream.hpp"
+#include "athena/Utility.hpp"
 
 namespace athena::io {
 /** @brief The IStreamReader class defines a basic API for reading from streams, Implementors are provided with one pure

include/athena/IStreamWriter.hpp

@@ -1,11 +1,14 @@
 #pragma once
 
-#include "utf8proc.h"
+#include <string>
-#include "IStream.hpp"
+#include <type_traits>
-#include "Utility.hpp"
-#include <memory>
 #include <vector>
 
+#include "utf8proc.h"
+
+#include "athena/IStream.hpp"
+#include "athena/Utility.hpp"
+
 namespace athena::io {
 class IStreamWriter : public IStream {
 public:

include/athena/MemoryWriter.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <string>
 #include <memory>
-#include <functional>
+#include <string>
+
 #include "athena/IStreamWriter.hpp"
 
 namespace athena::io {

include/athena/Socket.hpp

@@ -1,15 +1,12 @@
 #pragma once
 
-#include <sys/types.h>
+#include <cstddef>
-#include <fcntl.h>
+#include <cstdint>
 #include <string>
-#include <memory.h>
-
-#include "Global.hpp"
 
 #ifdef _WIN32
 #include <BaseTsd.h>
-typedef UINT_PTR SOCKET;
+using SOCKET = UINT_PTR;
 #endif
 
 struct sockaddr_in;

include/athena/Utility.hpp

@@ -1,11 +1,11 @@
 #ifndef __UTILITY_H__
 #define __UTILITY_H__
 
+#include <cstring>
 #include <string>
 #include <string_view>
 #include <vector>
-#include <cstdarg>
+
-#include <cstring>
 #include "athena/Global.hpp"
 #include "athena/Types.hpp"
 

include/athena/VectorWriter.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <string>
+#include <cstdint>
-#include <memory>
-#include <functional>
 #include <vector>
+
 #include "athena/IStreamWriter.hpp"
+#include "athena/Types.hpp"
 
 namespace athena::io {
 

include/athena/YAMLCommon.hpp

@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include <cstring>
-#include <yaml.h>
-#include <utf8proc.h>
-#include <vector>
 #include <memory>
-#include <functional>
+#include <string>
-#include "Global.hpp"
+#include <vector>
+
+#include <yaml.h>
+
+#include "athena/Types.hpp"
 
 namespace athena::io {
 class IStreamReader;

include/athena/YAMLDocReader.hpp

@@ -1,6 +1,14 @@
 #pragma once
 
-#include "YAMLCommon.hpp"
+#include <cstddef>
+#include <functional>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <vector>
+
+#include "athena/Types.hpp"
+#include "athena/YAMLCommon.hpp"
 
 namespace athena::io {
 

include/athena/YAMLDocWriter.hpp

@@ -1,6 +1,13 @@
 #pragma once
 
-#include "YAMLCommon.hpp"
+#include <cstddef>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <vector>
+
+#include "athena/Types.hpp"
+#include "athena/YAMLCommon.hpp"
 
 namespace athena::io {
 

src/athena/Checksums.cpp

@@ -1,7 +1,4 @@
 #include "athena/Checksums.hpp"
-#include "athena/FileReader.hpp"
-#include <iostream>
-#include <iomanip>
 
 namespace athena::checksums {
 atUint64 crc64(const atUint8* data, atUint64 length, atUint64 seed, atUint64 final) {

src/athena/Compression.cpp

@@ -1,8 +1,9 @@
 #include "athena/Compression.hpp"
+
 #if AT_LZOKAY
 #include <lzokay.hpp>
 #endif
-#include <iostream>
+
 #include <zlib.h>
 #include "LZ77/LZType10.hpp"
 #include "LZ77/LZType11.hpp"

src/athena/DNAYaml.cpp

@@ -1,5 +1,10 @@
 #include "athena/DNAYaml.hpp"
 
+#include <cctype>
+#include <cstdlib>
+
+#include "athena/YAMLCommon.hpp"
+
 namespace athena::io {
 
 template <>

src/athena/Dir.cpp

@@ -1,10 +1,14 @@
 #include "athena/Dir.hpp"
-#include <sys/stat.h>
+
 #include <climits>
 #include <cstdlib>
 #include <ctime>
+#include <sys/stat.h>
+
 #define __STDC_FORMAT_MACROS
 #include <cinttypes>
+
+#include "athena/FileInfo.hpp"
 #include "athena/Utility.hpp"
 
 #ifndef _WIN32

src/athena/FileInfo.cpp

@@ -1,11 +1,13 @@
 #include "athena/FileInfo.hpp"
-#include "athena/Utility.hpp"
+
-#include "athena/FileWriter.hpp"
+#include <climits>
-#include "athena/FileReader.hpp"
-#include <ctime>
 #include <cstdio>
-#include <limits.h>
 #include <cstdlib>
+#include <ctime>
+
+#include "athena/FileReader.hpp"
+#include "athena/FileWriter.hpp"
+#include "athena/Utility.hpp"
 
 #ifndef _WIN32
 #include <sys/time.h>

src/athena/FileWriterGeneric.cpp

@@ -1,5 +1,7 @@
 #include "athena/FileWriter.hpp"
 
+#include <cstring>
+
 namespace athena::io {
 void TransactionalFileWriter::seek(atInt64 pos, SeekOrigin origin) {
   switch (origin) {

src/athena/MemoryReader.cpp

@@ -1,11 +1,8 @@
 #include "athena/MemoryReader.hpp"
 
-#include <cstdio>
-#include <cstdlib>
-#include <vector>
-#include <iostream>
-#include <cstring>
 #include <algorithm>
+#include <cstdio>
+#include <cstring>
 
 #ifdef HW_RVL
 #include <malloc.h>

src/athena/MemoryWriter.cpp

@@ -2,8 +2,6 @@
 
 #include <cstdio>
 #include <cstring>
-#include <vector>
-#include <iostream>
 
 #ifdef HW_RVL
 #include <malloc.h>

src/athena/Socket.cpp

@@ -1,18 +1,21 @@
 #include "athena/Socket.hpp"
 
 #ifndef _WIN32
-#include <sys/socket.h>
+#include <cerrno>
-#include <netinet/in.h>
+
-#include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <sys/socket.h>
 #include <unistd.h>
-#include <cerrno>
 #else
 #include <WinSock2.h>
 #include <Ws2tcpip.h>
 #endif
 
+#include "athena/Global.hpp"
+
 namespace athena::net {
 
 /* Define the low-level send/receive flags, which depend on the OS */

src/athena/Utility.cpp

@@ -1,15 +1,16 @@
 #include "athena/Utility.hpp"
-#include <iostream>
+
-#include <cstring>
-#include <cstdlib>
-#include <sstream>
 #include <algorithm>
 #include <cstdarg>
-#include <iterator>
 #include <cstdio>
-#include <sys/types.h>
+#include <cstdlib>
-#include <sys/stat.h>
+#include <cstring>
+#include <iterator>
 #include <random>
+#include <sstream>
+
+#include <sys/stat.h>
+#include <sys/types.h>
 #include "utf8proc.h"
 
 #ifdef _MSC_VER

src/athena/VectorWriter.cpp

@@ -1,10 +1,8 @@
 #include "athena/VectorWriter.hpp"
 
-#include <cstdio>
+#include <algorithm>
 #include <cstring>
 #include <vector>
-#include <iostream>
-#include <algorithm>
 
 namespace athena::io {