diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-07-15 10:22:29 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-23 18:05:59 +0100 |
| commit | 770fbcca0cae18faac981a326d73996afc20b9ba (patch) | |
| tree | 2e173ff2e397e56975cb37a10ec11119ec3af41f /src/server/game/Chat/ChatCommands | |
| parent | cd86a015c46f8da581f86857e313d9c596dba7fa (diff) | |
Core/Misc: Replace boost::optional with std::optional (#25047)
C++17 is already mandatory, so it's a safe thing to do
(cherry picked from commit 202fd41389973322f63186fd8e5a368fce3e1b04)
Diffstat (limited to 'src/server/game/Chat/ChatCommands')
| -rw-r--r-- | src/server/game/Chat/ChatCommands/ChatCommand.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.h b/src/server/game/Chat/ChatCommands/ChatCommand.h index fdcf38745ad..840915b4d2f 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommand.h +++ b/src/server/game/Chat/ChatCommands/ChatCommand.h @@ -121,11 +121,11 @@ struct CommandArgsConsumerMulti<Tuple, Optional<NestedNextType>, offset> // try with the argument auto& myArg = std::get<offset>(tuple); myArg.emplace(); - if (char const* next = CommandArgsConsumerSingle<NestedNextType>::TryConsumeTo(*(myArg.get_ptr()), args)) + if (char const* next = CommandArgsConsumerSingle<NestedNextType>::TryConsumeTo(myArg.value(), args)) if ((next = CommandArgsConsumerNext<Tuple, offset+1>::GoNext(tuple, next))) return next; // try again omitting the argument - myArg = boost::none; + myArg = std::nullopt; if (char const* next = CommandArgsConsumerNext<Tuple, offset+1>::GoNext(tuple, args)) return next; return nullptr; @@ -160,8 +160,8 @@ class TC_GAME_API CommandArgs { Optional<std::tuple<advstd::remove_cvref_t<T1>, advstd::remove_cvref_t<T2>, advstd::remove_cvref_t<Ts>...>> rv; rv.emplace(); - if (!TryConsumeToTuple<0>(*(rv.get_ptr()))) - rv = boost::none; + if (!TryConsumeToTuple<0>(rv.value())) + rv = std::nullopt; return rv; } @@ -171,10 +171,10 @@ class TC_GAME_API CommandArgs using T = advstd::remove_cvref_t<T1>; Optional<T> rv; rv.emplace(); - if (char const* next = CommandArgsConsumerSingle<T>::TryConsumeTo(*(rv.get_ptr()), _args)) + if (char const* next = CommandArgsConsumerSingle<T>::TryConsumeTo(rv.value(), _args)) _args = next; else - rv = boost::none; + rv = std::nullopt; return rv; } |
