Skip to content

Commit

Permalink
boost::optional を std::optional に変更する
Browse files Browse the repository at this point in the history
  • Loading branch information
zztkm committed Jan 2, 2025
1 parent 4d59593 commit 436284d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)")
Expand Down
2 changes: 1 addition & 1 deletion src/zakuro.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 436284d

Please sign in to comment.