Skip to content

Commit

Permalink
fix unable to use debug mode
Browse files Browse the repository at this point in the history
  • Loading branch information
hxxft committed May 28, 2018
1 parent 9ddd60c commit 1eaf512
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Core/base/timer/timer_heap.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class TimerHeap {
public:
TimerHeap(): lock_() {}
~TimerHeap() {}
uint64_t NextTimeout() { return !min_heap_.empty() ? min_heap_[0].next_timeout_ : ULONG_MAX; }
uint64_t NextTimeout() { return !min_heap_.empty() ? min_heap_[0].next_timeout_ : ULLONG_MAX; }
bool IsEmpty() { return min_heap_.empty(); }
void Remove();
TimerNode Pop();
Expand Down
2 changes: 1 addition & 1 deletion Core/net/websocket/websocket_frame.cc
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ namespace net {
// practice, this will work for the compilers and architectures currently
// supported by Chromium, and the tests are extremely unlikely to pass if a
// future compiler/architecture breaks it.
//*reinterpret_cast<size_t*>(merged) ^= packed_mask_key;
*reinterpret_cast<size_t*>(merged) ^= packed_mask_key;
}

MaskWebSocketFramePayloadByBytes(
Expand Down

0 comments on commit 1eaf512

Please sign in to comment.