diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b8e645..70e9ae1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,7 +122,6 @@ set(SOURCE_FILES src/protocol/CryptHandler.cpp src/protocol/CompressionHandler.cpp - src/PermissionManager.cpp src/Properties.cpp src/Error.cpp src/Variable.cpp @@ -153,7 +152,6 @@ set(HEADER_FILES src/misc/advanced_mutex.h src/misc/strobf.h - src/PermissionManager.h src/protocol/buffers.h src/protocol/Packet.h src/Properties.h @@ -216,12 +214,14 @@ if (TEASPEAK_SERVER) set(SOURCE_FILES ${SOURCE_FILES} + src/PermissionManager.cpp src/BasicChannel.cpp src/lookup/ip.cpp ) set(HEADER_FILES ${HEADER_FILES} src/BasicChannel.h + src/PermissionManager.h ) endif () diff --git a/src/EventLoop.cpp b/src/EventLoop.cpp index 9ad413a..766c025 100644 --- a/src/EventLoop.cpp +++ b/src/EventLoop.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include "./EventLoop.h" diff --git a/src/PermissionManager.cpp b/src/PermissionManager.cpp index 84aac8a..70a0134 100644 --- a/src/PermissionManager.cpp +++ b/src/PermissionManager.cpp @@ -1,7 +1,7 @@ #include #include #include "misc/memtracker.h" -#include "BasicChannel.h" +#include "./PermissionManager.h" using namespace std; using namespace ts; diff --git a/src/Properties.h b/src/Properties.h index a2a9b35..481f8b4 100644 --- a/src/Properties.h +++ b/src/Properties.h @@ -780,8 +780,10 @@ namespace ts { } +#ifndef WIN32 template [[nodiscard]] operator T(){ return this->as(); } +#endif template [[nodiscard]] T as_save(const std::function defaultValue = []{ return T{}; }) const {