xaymar/DataPath
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

waitable: Fix asserts

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-01-07 00:21:33 +01:00
parent c6de678c36
commit 98654b68f1
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/windows/waitable.cpp
+5 -7
View File
@@ -25,7 +25,7 @@ extern "C" {
datapath::error datapath::waitable::wait(datapath::waitable* obj, std::chrono::nanoseconds duration) datapath::error datapath::waitable::wait(datapath::waitable* obj, std::chrono::nanoseconds duration)
{ {
assert(obj == nullptr); assert(obj != nullptr);
HANDLE handle = (HANDLE)obj->get_waitable(); HANDLE handle = (HANDLE)obj->get_waitable();
int64_t timeout = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count(); int64_t timeout = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count();
@@ -61,9 +61,8 @@ datapath::error datapath::waitable::wait(datapath::waitable* obj, std::chrono::n
datapath::error datapath::waitable::wait(datapath::waitable** objs, size_t count, std::chrono::nanoseconds duration) datapath::error datapath::waitable::wait(datapath::waitable** objs, size_t count, std::chrono::nanoseconds duration)
{ {
assert(objs == nullptr); assert(objs != nullptr);
assert(count == 0); assert((count > 0) && (count <= MAXIMUM_WAIT_OBJECTS));
assert(count > MAXIMUM_WAIT_OBJECTS);
int64_t timeout = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count(); int64_t timeout = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count();
@@ -115,9 +114,8 @@ datapath::error datapath::waitable::wait(datapath::waitable** objs, size_t count
datapath::error datapath::waitable::wait_any(datapath::waitable** objs, size_t count, size_t& index, datapath::error datapath::waitable::wait_any(datapath::waitable** objs, size_t count, size_t& index,
std::chrono::nanoseconds duration) std::chrono::nanoseconds duration)
{ {
assert(objs == nullptr); assert(objs != nullptr);
assert(count == 0); assert((count > 0) && (count <= MAXIMUM_WAIT_OBJECTS));
assert(count > MAXIMUM_WAIT_OBJECTS);
int64_t timeout = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count(); int64_t timeout = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count();