feat/update_config #10

Merged
tqcq merged 26 commits from feat/update_config into master 2024-10-14 10:15:01 +08:00
3 changed files with 3 additions and 11 deletions
Showing only changes of commit 80eb00711b - Show all commits

View File

@ -89,7 +89,7 @@ private:
}
private:
std::variant<mpark::monostate, value_type> holding_;
mpark::variant<mpark::monostate, value_type> holding_;
};
static_assert(std::is_void<decltype(std::declval<Boxed<>>().Get())>::value, "");
@ -110,7 +110,7 @@ RetrieveBoxed()
template<typename... Ts>
template<typename... Us, typename>
Boxed<Ts...>::Boxed(box_values_t, Us &&...imms) : holding_(std::in_place_index_t<kValue>(), std::forward<Us>(imms)...)
Boxed<Ts...>::Boxed(box_values_t, Us &&...imms) : holding_(mpark::in_place_index_t<kValue>(), std::forward<Us>(imms)...)
{}
template<typename... Ts>

View File

@ -43,7 +43,7 @@ private:
private:
// std::mutex lock_;
Mutex lock_;
std::variant<WaitingForSingleObject, Satisfied> state_;
mpark::variant<WaitingForSingleObject, Satisfied> state_;
Executor executor_;
};

View File

@ -3,14 +3,6 @@
#pragma once
#if __cplusplus >= 201703L
#include <variant>
#else
#include "tile/base/internal/variant.h"
namespace std {
using namespace mpark;
}
#endif
#endif// TILE_BASE_VARIANT_H