From f93b7ce8b162e12231e15fd164afb30b03cd69b0 Mon Sep 17 00:00:00 2001 From: JDierkse Date: Mon, 24 Feb 2020 20:46:20 +0100 Subject: [PATCH] Fix Includes and Headers --- .gitignore | 2 -- Libraries/Logging | 1 + Network/IcmpClientImpl.h | 2 +- Network/IcmpHeader.h | 8 ++++---- Network/Ipv4Header.h | 8 ++++---- Network/UdpClientImpl.cpp | 2 +- Network/UdpClientImpl.h | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) create mode 120000 Libraries/Logging diff --git a/.gitignore b/.gitignore index 5c150de..851ef09 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,3 @@ .*.swp .AppleDouble lib -Libraries -fixPermissions.sh diff --git a/Libraries/Logging b/Libraries/Logging new file mode 120000 index 0000000..e18bda1 --- /dev/null +++ b/Libraries/Logging @@ -0,0 +1 @@ +../../Logging \ No newline at end of file diff --git a/Network/IcmpClientImpl.h b/Network/IcmpClientImpl.h index da13e48..9de10bd 100644 --- a/Network/IcmpClientImpl.h +++ b/Network/IcmpClientImpl.h @@ -3,7 +3,7 @@ #include "Ipv4Header.h" #include "IcmpHeader.h" -#include "asio.hpp" +#include #include #include #include diff --git a/Network/IcmpHeader.h b/Network/IcmpHeader.h index e7c783c..54f0da5 100644 --- a/Network/IcmpHeader.h +++ b/Network/IcmpHeader.h @@ -1,7 +1,7 @@ -#ifndef ICMPHEADER_H -#define ICMPHEADER_H +#ifndef NETWORK_ICMPHEADER_H +#define NETWORK_ICMPHEADER_H -#include "asio.hpp" +#include #include @@ -84,4 +84,4 @@ void ComputeChecksum(IcmpHeader& header, } // namespace Internal } // namespace Network -#endif // ICMPHEADER_H +#endif // NETWORK_ICMPHEADER_H diff --git a/Network/Ipv4Header.h b/Network/Ipv4Header.h index 9715df0..ac687c2 100644 --- a/Network/Ipv4Header.h +++ b/Network/Ipv4Header.h @@ -1,7 +1,7 @@ -#ifndef IPV4HEADER_H -#define IPV4HEADER_H +#ifndef NETWORK_IPV4HEADER_H +#define NETWORK_IPV4HEADER_H -#include "asio.hpp" +#include #include @@ -60,4 +60,4 @@ private: } // namespace Internal } // namespace Network -#endif // IPV4HEADER_H +#endif // HEADER_IPV4HEADER_H diff --git a/Network/UdpClientImpl.cpp b/Network/UdpClientImpl.cpp index 27bf74e..43477af 100644 --- a/Network/UdpClientImpl.cpp +++ b/Network/UdpClientImpl.cpp @@ -1,5 +1,5 @@ #include "UdpClientImpl.h" -#include "Logging.h" +#include namespace Network { diff --git a/Network/UdpClientImpl.h b/Network/UdpClientImpl.h index bcf7191..3a92dbd 100644 --- a/Network/UdpClientImpl.h +++ b/Network/UdpClientImpl.h @@ -1,7 +1,7 @@ #ifndef NETWORK_UDPCLIENTIMPL_H #define NETWORK_UDPCLIENTIMPL_H -#include "asio.hpp" +#include #include #include #include