forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 67badf694..82460b212
82460b212 feat: add ngc events 24b54722a fix: Ensure we have allocators available for the error paths. 48dbcfebc cleanup: Remove redundant `-DSODIUM_EXPORT` from definitions. 0cef46ee9 cleanup: Fix a few more clang-tidy warnings. 0c5b918e9 cleanup: Fix a few more clang-tidy warnings. 4d3c97f49 cleanup: Enforce stricter identifier naming using clang-tidy. a549807df refactor: Add `mem` module to allow tests to override allocators. 6133fb153 chore: Add devcontainer setup for codespaces. 620e07ecd chore: Set a timeout for tests started using Conan c0ec33b16 chore: Migrate Windows CI from Appveyor to Azure DevOps 8ed47f3ef fix incorrect documentation a1e245841 docs: Fix doxygen config and remove some redundant comments. b0f633185 chore: Fix the Android CI job 7469a529b fix: Add missing `#include <array>`. 2b1a6b0d2 add missing ngc constants getter declarations and definitions 2e02d5637 chore: Add missing module dependencies. REVERT: 67badf694 feat: add ngc events git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 82460b2124216af1ac9d63060de310a682a2fd15
This commit is contained in:
@ -8,6 +8,7 @@ namespace {
|
||||
|
||||
struct Announces : ::testing::Test {
|
||||
protected:
|
||||
const Memory *mem_ = system_memory();
|
||||
uint64_t clock_ = 0;
|
||||
Mono_Time *mono_time_ = nullptr;
|
||||
GC_Announces_List *gca_ = nullptr;
|
||||
@ -16,7 +17,7 @@ protected:
|
||||
|
||||
void SetUp() override
|
||||
{
|
||||
mono_time_ = mono_time_new(nullptr, nullptr);
|
||||
mono_time_ = mono_time_new(mem_, nullptr, nullptr);
|
||||
ASSERT_NE(mono_time_, nullptr);
|
||||
mono_time_set_current_time_callback(
|
||||
mono_time_, [](void *user_data) { return *static_cast<uint64_t *>(user_data); },
|
||||
@ -28,7 +29,7 @@ protected:
|
||||
~Announces() override
|
||||
{
|
||||
kill_gca(gca_);
|
||||
mono_time_free(mono_time_);
|
||||
mono_time_free(mem_, mono_time_);
|
||||
}
|
||||
|
||||
void advance_clock(uint64_t increment)
|
||||
|
Reference in New Issue
Block a user