Skip to content

Commit

Permalink
))
Browse files Browse the repository at this point in the history
  • Loading branch information
kelbon committed Dec 23, 2024
1 parent aefea5f commit f5cafca
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 30 deletions.
4 changes: 2 additions & 2 deletions benchmarks/fuzzing.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -367,15 +367,15 @@ struct randomizer<std::optional<T>> {
return std::optional<T>(randomizer<T>::generate(context, generator));
}
};
#if 0

template <typename T>
struct randomizer<tgbm::api::optional<T>> {
static constexpr bool is_nesting = randomizer<T>::is_nesting;
static tgbm::api::optional<T> generate(Context context, auto&& generator) {
return tgbm::api::optional<T>(randomizer<T>::generate(context, generator));
}
};
#endif

template <>
struct randomizer<tgbm::api::True> {
static constexpr bool is_nesting = false;
Expand Down
8 changes: 4 additions & 4 deletions gtest/api/basic_types.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
struct empty_test_type {
bool operator==(const empty_test_type&) const = default;
};
#if 0
#ifndef _WIN32

#ifndef _WIN32
static_assert(sizeof(tgbm::api::optional<empty_test_type>) == 1);
#endif
#endif

static_assert(sizeof(tgbm::api::optional<tgbm::const_string>) == sizeof(void*));
static_assert(sizeof(tgbm::api::optional<bool>) == sizeof(bool));
static_assert(sizeof(tgbm::api::optional<tgbm::api::Integer>) == sizeof(tgbm::api::Integer));
#endif

template <typename T>
constexpr bool opttest(T v1, T v2) {
tgbm::api::optional<T> opt = std::nullopt;
Expand Down
16 changes: 1 addition & 15 deletions include/tgbm/api/optional.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,6 @@

namespace tgbm {

template <typename T>
struct optional_traits;

}

namespace tgbm::api {

template <typename T>
using optional = std::optional<T>;

}

#if 0
template <typename Traits, typename T>
concept optional_traits_for = requires { requires std::is_destructible_v<typename Traits::state_type>; } &&
requires(typename Traits::state_type& state) {
Expand Down Expand Up @@ -398,5 +385,4 @@ struct TGBM_TRIVIAL_ABI optional {
template <typename T>
optional(T&&) -> optional<std::decay_t<T>>;

} // namespace tgbm
#endif
} // namespace tgbm::api
3 changes: 1 addition & 2 deletions include/tgbm/jsons/boostjson_serialize_dom.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@ void tag_invoke(value_from_tag, value& jv, const std::optional<T>& val) {
jv = boost::json::value_from(*val);
}
}
#if 0

template <typename T>
void tag_invoke(value_from_tag, value& jv, const tgbm::api::optional<T>& val) {
if (val) {
jv = boost::json::value_from(*val);
}
}
#endif

template <typename T>
void tag_invoke(value_from_tag, value& jv, const tgbm::box<T>& val) {
Expand Down
4 changes: 2 additions & 2 deletions include/tgbm/jsons/parse_dom/optional.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ struct basic_optional_parser {

template <typename T>
struct parser<box<T>> : basic_optional_parser<box<T>> {};
#if 0

template <typename T>
struct parser<tgbm::api::optional<T>> : basic_optional_parser<tgbm::api::optional<T>> {};
#endif

template <typename T>
struct parser<std::optional<T>> : basic_optional_parser<std::optional<T>> {};

Expand Down
4 changes: 2 additions & 2 deletions include/tgbm/jsons/parse_sax/optional_parser.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ struct basic_optional_parser {

template <typename T>
struct sax_parser<std::optional<T>> : basic_optional_parser<std::optional<T>> {};
#if 0

template <typename T>
struct sax_parser<api::optional<T>> : basic_optional_parser<api::optional<T>> {};
#endif

template <typename T>
struct sax_parser<box<T>> : basic_optional_parser<box<T>> {};

Expand Down
7 changes: 4 additions & 3 deletions src/telegram.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <tgbm/utils/deadline.hpp>

namespace tgbm::api {

#if 1
dd::task<arrayof<Update>> telegram::getUpdates(api::get_updates_request request, deadline_t deadline) const {
arrayof<Update>& result = co_await dd::this_coro::return_place;
reqerr_t err = co_await api::send_request(request, client, bottoken, result, deadline);
Expand Down Expand Up @@ -1015,7 +1015,8 @@ dd::task<MenuButton> telegram::getChatMenuButton(api::get_chat_menu_button_reque
}
co_return dd::rvo;
}

#endif
#if 1
dd::task<bool> telegram::setMyDefaultAdministratorRights(
api::set_my_default_administrator_rights_request request, deadline_t deadline) const {
bool& result = co_await dd::this_coro::return_place;
Expand Down Expand Up @@ -1476,5 +1477,5 @@ dd::task<arrayof<GameHighScore>> telegram::getGameHighScores(api::get_game_high_
}
co_return dd::rvo;
}

#endif
} // namespace tgbm::api

0 comments on commit f5cafca

Please sign in to comment.