fix(variant): use mpark:xxx
Some checks failed
android / build (push) Failing after 12s
linux-aarch64-cpu-gcc / linux-gcc-aarch64 (Debug) (push) Failing after 8s
linux-aarch64-cpu-gcc / linux-gcc-aarch64 (Release) (push) Failing after 9s
linux-arm-gcc / linux-gcc-arm (Debug) (push) Failing after 8s
linux-arm-gcc / linux-gcc-arm (Release) (push) Failing after 8s
linux-arm-gcc / linux-gcc-armhf (Debug) (push) Failing after 9s
linux-arm-gcc / linux-gcc-armhf (Release) (push) Failing after 14s
linux-mips-gcc / linux-gcc-mipsel (Debug) (push) Failing after 9s
linux-mips-gcc / linux-gcc-mipsel (Release) (push) Failing after 7s
linux-mips64-gcc / linux-gcc-mips64el (Debug) (push) Failing after 8s
linux-mips64-gcc / linux-gcc-mips64el (Release) (push) Failing after 8s
linux-riscv64-gcc / linux-gcc-riscv64 (Debug) (push) Failing after 8s
linux-riscv64-gcc / linux-gcc-riscv64 (Release) (push) Failing after 10s
linux-x64-clang / linux-clang (Debug) (push) Failing after 8s
linux-x64-clang / linux-clang (Release) (push) Failing after 8s
android / build (pull_request) Failing after 8s
linux-x64-gcc / linux-gcc (Debug) (push) Failing after 7s
linux-x64-gcc / linux-gcc (Release) (push) Failing after 9s
linux-aarch64-cpu-gcc / linux-gcc-aarch64 (Debug) (pull_request) Failing after 13s
linux-aarch64-cpu-gcc / linux-gcc-aarch64 (Release) (pull_request) Failing after 9s
linux-x86-gcc / linux-gcc (Debug) (push) Failing after 8s
linux-x86-gcc / linux-gcc (Release) (push) Failing after 9s
linux-arm-gcc / linux-gcc-arm (Debug) (pull_request) Failing after 8s
linux-arm-gcc / linux-gcc-arm (Release) (pull_request) Failing after 8s
linux-arm-gcc / linux-gcc-armhf (Debug) (pull_request) Failing after 8s
linux-arm-gcc / linux-gcc-armhf (Release) (pull_request) Failing after 13s
linux-mips-gcc / linux-gcc-mipsel (Debug) (pull_request) Failing after 12s
linux-mips-gcc / linux-gcc-mipsel (Release) (pull_request) Failing after 9s
linux-mips64-gcc / linux-gcc-mips64el (Debug) (pull_request) Failing after 9s
linux-mips64-gcc / linux-gcc-mips64el (Release) (pull_request) Failing after 8s
linux-riscv64-gcc / linux-gcc-riscv64 (Debug) (pull_request) Failing after 8s
linux-riscv64-gcc / linux-gcc-riscv64 (Release) (pull_request) Failing after 13s
linux-x64-clang / linux-clang (Debug) (pull_request) Failing after 9s
linux-x64-clang / linux-clang (Release) (pull_request) Failing after 9s
linux-x64-gcc / linux-gcc (Debug) (pull_request) Failing after 9s
linux-x64-gcc / linux-gcc (Release) (pull_request) Failing after 7s
linux-x86-gcc / linux-gcc (Debug) (pull_request) Failing after 10s
linux-x86-gcc / linux-gcc (Release) (pull_request) Failing after 8s

This commit is contained in:
tqcq 2024-09-30 17:10:22 +08:00
parent 64b25815a2
commit 80eb00711b
3 changed files with 3 additions and 11 deletions

View File

@ -89,7 +89,7 @@ private:
} }
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, ""); static_assert(std::is_void<decltype(std::declval<Boxed<>>().Get())>::value, "");
@ -110,7 +110,7 @@ RetrieveBoxed()
template<typename... Ts> template<typename... Ts>
template<typename... Us, typename> 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> template<typename... Ts>

View File

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

View File

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