From e8874acc69f2143c24970772c120c480c7d13229 Mon Sep 17 00:00:00 2001
From: Alexander Zhirov <a.zhirov@agrohold.ru>
Date: Mon, 20 Mar 2023 13:56:40 +0300
Subject: [PATCH] update

---
 CMakeLists.txt              | 4 ++--
 include/boost/sml.hpp       | 2 +-
 libtgvoip/CMakeLists.txt    | 2 +-
 libtgvoip/audio/AudioIO.cpp | 1 +
 tg2sip/logging.cpp          | 3 ++-
 tg2sip/queue.h              | 1 +
 tg2sip/utils.cpp            | 3 ++-
 7 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8507dbe..8a74756 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ add_subdirectory(libtgvoip)
 
 find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Td 1.7.10 REQUIRED)
-find_package(spdlog 0.17 REQUIRED)
+find_package(Td 1.8.0 REQUIRED)
+find_package(spdlog 1.11.0 REQUIRED)
 pkg_check_modules(PJSIP libpjproject>=2.8 REQUIRED)
 pkg_check_modules(OPUS opus REQUIRED)
 
diff --git a/include/boost/sml.hpp b/include/boost/sml.hpp
index a28bddf..3245862 100644
--- a/include/boost/sml.hpp
+++ b/include/boost/sml.hpp
@@ -2525,7 +2525,7 @@ BOOST_SML_NAMESPACE_END
 #if defined(__clang__)
 #pragma clang diagnostic pop
 #elif defined(__GNUC__)
-#undef __has_builtin
+//#undef __has_builtin
 #pragma GCC diagnostic pop
 #elif defined(_MSC_VER)
 #undef __has_builtin
diff --git a/libtgvoip/CMakeLists.txt b/libtgvoip/CMakeLists.txt
index a9658fb..1a98b60 100644
--- a/libtgvoip/CMakeLists.txt
+++ b/libtgvoip/CMakeLists.txt
@@ -4,7 +4,7 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(OPUS opus REQUIRED)
 pkg_check_modules(OPENSSL openssl REQUIRED)
 pkg_check_modules(PJSIP libpjproject>=2.8 REQUIRED)
-find_package(spdlog 0.17)
+find_package(spdlog 1.11.0)
 
 add_library(libtgvoip STATIC
         BlockingQueue.cpp
diff --git a/libtgvoip/audio/AudioIO.cpp b/libtgvoip/audio/AudioIO.cpp
index ad2ec82..23faf89 100644
--- a/libtgvoip/audio/AudioIO.cpp
+++ b/libtgvoip/audio/AudioIO.cpp
@@ -85,6 +85,7 @@ AudioIO* AudioIO::Create(std::string inputDevice, std::string outputDevice){
 #endif
 #endif
 #endif
+	return NULL;
 }
 
 bool AudioIO::Failed(){
diff --git a/tg2sip/logging.cpp b/tg2sip/logging.cpp
index 8a51353..1d81a5c 100755
--- a/tg2sip/logging.cpp
+++ b/tg2sip/logging.cpp
@@ -18,6 +18,7 @@
 #include <iostream>
 #include <td/telegram/Log.h>
 #include "logging.h"
+#include <spdlog/sinks/rotating_file_sink.h>
 
 void init_logging(Settings &settings) {
 
@@ -62,4 +63,4 @@ void init_logging(Settings &settings) {
     spdlog::get("pjsip")->set_level(static_cast<spdlog::level::level_enum>(settings.pjsip_log_level()));
     spdlog::get("tgvoip")->set_level(static_cast<spdlog::level::level_enum>(settings.tgvoip_log_level()));
 
-}
\ No newline at end of file
+}
diff --git a/tg2sip/queue.h b/tg2sip/queue.h
index bfe1fa0..3e9c555 100755
--- a/tg2sip/queue.h
+++ b/tg2sip/queue.h
@@ -20,6 +20,7 @@
 
 #include <mutex>
 #include <queue>
+#include <optional>
 #include <condition_variable>
 
 template<typename T>
diff --git a/tg2sip/utils.cpp b/tg2sip/utils.cpp
index c8da02b..548b66d 100644
--- a/tg2sip/utils.cpp
+++ b/tg2sip/utils.cpp
@@ -17,5 +17,6 @@
 
 #include <algorithm>
 #include "utils.h"
+#include <string>
 
-bool is_digits(const std::string &str) { return std::all_of(str.begin(), str.end(), ::isdigit); };
\ No newline at end of file
+bool is_digits(const std::string &str) { return std::all_of(str.begin(), str.end(), ::isdigit); };