From 436284d20f965a28acea332ed211e1a2b1a43d93 Mon Sep 17 00:00:00 2001
From: zztkm <zztkm@tsurutatakumi.info>
Date: Thu, 2 Jan 2025 16:31:40 +0900
Subject: [PATCH] =?UTF-8?q?boost::optional=20=E3=82=92=20std::optional=20?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.md   | 2 +-
 src/util.cpp | 6 ++----
 src/zakuro.h | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d139175..c88f108 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -33,7 +33,7 @@
   - `#include <rtc_base/helpers.h>` を `#include <rtc_base/crypto_random.h>` に置き換える
   - `boost::json::error_code` を `boost::system::error_code` に置き換える
   - `absl::nullopt` を `std::nullopt` に置き換える
-  - ZakuroConfig の `sora_data_channel_signaling` と `sora_ignore_disconnect_websocket` の型を `std::optional<bool>` に置き換える
+  - `boost::optional` を std::optional` に置き換える
   - @melpon @voluntas @zztkm
 - [UPDATE] Blend2D, AsmJit を最新版に上げる
   - @melpon, @torikizi
diff --git a/src/util.cpp b/src/util.cpp
index 9e48dba..0a8ca41 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -12,8 +12,6 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/json.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_io.hpp>
 #include <boost/preprocessor/stringize.hpp>
 
 // WebRTC
@@ -85,8 +83,8 @@ void Util::ParseArgs(const std::vector<std::string>& cargs,
   auto bool_map = std::vector<std::pair<std::string, bool>>(
       {{"false", false}, {"true", true}});
   auto optional_bool_map =
-      std::vector<std::pair<std::string, boost::optional<bool>>>(
-          {{"false", false}, {"true", true}, {"none", boost::none}});
+      std::vector<std::pair<std::string, std::optional<bool>>>(
+          {{"false", false}, {"true", true}, {"none", std::nullopt}});
 
   app.add_option("--name", config.name, "Client Name");
   app.add_option("--vcs", config.vcs, "Virtual Clients (default: 1)")
diff --git a/src/zakuro.h b/src/zakuro.h
index 2aeed2a..d3130ab 100644
--- a/src/zakuro.h
+++ b/src/zakuro.h
@@ -55,7 +55,7 @@ struct ZakuroConfig {
   std::string sora_audio_codec_type = "";
   // Lyra 用の設定
   int sora_audio_codec_lyra_bit_rate = 0;
-  boost::optional<bool> sora_audio_codec_lyra_usedtx;
+  std::optional<bool> sora_audio_codec_lyra_usedtx;
   bool sora_check_lyra_version = false;
   // 0 の場合ビットレートは Sora 側で決める
   int sora_video_bit_rate = 0;