Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions iocore/eventsystem/I_Action.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class Action
machine.

*/
int cancelled = false;
bool cancelled = false;

/**
Cancels the asynchronous operation represented by this action.
Expand All @@ -141,14 +141,8 @@ class Action
cancel(Continuation *c = nullptr)
{
ink_assert(!c || c == continuation);
#ifdef DEBUG
ink_assert(!cancelled);
cancelled = true;
#else
if (!cancelled) {
cancelled = true;
}
#endif
}

/**
Expand All @@ -166,14 +160,8 @@ class Action
cancel_action(Continuation *c = nullptr)
{
ink_assert(!c || c == continuation);
#ifdef DEBUG
ink_assert(!cancelled);
cancelled = true;
#else
if (!cancelled) {
cancelled = true;
}
#endif
}

Continuation *
Expand Down