summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/net/client.hpp3
-rw-r--r--include/net/conn.hpp3
-rw-r--r--include/net/server.hpp3
-rw-r--r--include/net/types.hpp14
4 files changed, 10 insertions, 13 deletions
diff --git a/include/net/client.hpp b/include/net/client.hpp
index 234ca90..23d250b 100644
--- a/include/net/client.hpp
+++ b/include/net/client.hpp
@@ -1,6 +1,5 @@
#pragma once
-#include "net/conn.hpp"
#include <cerrno>
#include <cstdio>
#include <cstdlib>
@@ -19,6 +18,8 @@
#include <sys/wait.h>
#include <unistd.h>
+#include "net/conn.hpp"
+
namespace net {
class client {
diff --git a/include/net/conn.hpp b/include/net/conn.hpp
index 6569973..95992ed 100644
--- a/include/net/conn.hpp
+++ b/include/net/conn.hpp
@@ -3,10 +3,11 @@
#include <cstdint>
#include <functional>
#include <map>
-#include <netinet/in.h>
#include <span>
#include <vector>
+#include <netinet/in.h>
+
#include "net/packet.hpp"
namespace net {
diff --git a/include/net/server.hpp b/include/net/server.hpp
index 9a27a25..30791fc 100644
--- a/include/net/server.hpp
+++ b/include/net/server.hpp
@@ -1,6 +1,5 @@
#pragma once
-#include "net/conn.hpp"
#include <cerrno>
#include <cstdio>
#include <cstdlib>
@@ -19,6 +18,8 @@
#include <sys/wait.h>
#include <unistd.h>
+#include "net/conn.hpp"
+
namespace net {
class server {
diff --git a/include/net/types.hpp b/include/net/types.hpp
index 8f0e383..a4a8c3b 100644
--- a/include/net/types.hpp
+++ b/include/net/types.hpp
@@ -1,16 +1,10 @@
#pragma once
-#include <array>
-#include <cassert>
-#include <concepts>
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
-#include <span>
#include <string>
-#include <sys/types.h>
#include <vector>
+#include <array>
+#include <span>
+#include <cstring>
#include "util/bitset.hpp"
#include "util/endian.hpp"
@@ -25,7 +19,7 @@ template <class T>
concept packet = requires(T x) { x.packet_id; };
template <class T>
-concept compressed_packet = requires(T x) { packet<T>&& x.compressed; };
+concept compressed_packet = packet<T> && requires(T x) { x.compressed; };
template <class T>
concept netmodule = requires(T x) { x.module_id; };