diff options
| author | Abseil Team <absl-team@google.com> | 2018-07-18T18·29-0700 |
|---|---|---|
| committer | Ashley Hedberg <ahedberg@google.com> | 2018-07-19T12·54-0400 |
| commit | 2c5af55ed34850d8b7dd46177c8ca53fdfda920e (patch) | |
| tree | 99d25b10270c1bc8fa184c3d5df8855b2deb3bbe /absl/synchronization/internal/kernel_timeout.h | |
| parent | 44aa275286baf97fc13529aca547a88b180beb08 (diff) | |
Export of internal Abseil changes.
--
60bc1e62580e0ff352a92c785f29550c2000447d by Xiaoyi Zhang <zhangxy@google.com>:
Import Github PR https://github.com/abseil/abseil-cpp/pull/143.
absl/synchronization/internal/kernel_timeout.h uses INFINITE macro that comes from windows.h that is included by winsock2.h that is included by absl/time/time.h. This internal header will be included by public header. It should not depend on windows.h.
PiperOrigin-RevId: 205109009
--
1617f0a333a8030e4e4c0bc1eef71f4a5fe9874d by Abseil Team <absl-team@google.com>:
Internal change
PiperOrigin-RevId: 205101804
--
8dce298b8c96c12c423943a366a4d92a554366c4 by Chris Kennelly <ckennelly@google.com>:
Define UNALIGNED_LOAD/STORE macros for UNDEFINED_BEHAVIOR_SANITIZER.
When using UBSan in trap mode (that is, without the ubsan runtime library), the
x86 macros can cause alignment errors as they assume unaligned loads/stores are
permitted. The macros defined in the presence of
{ADDRESS,THREAD,MEMORY}_SANITIZER require the runtime library.
PiperOrigin-RevId: 205096794
GitOrigin-RevId: 60bc1e62580e0ff352a92c785f29550c2000447d
Change-Id: I65a6cc86a711796c9d3a605310d67795b9f76ce9
Diffstat (limited to 'absl/synchronization/internal/kernel_timeout.h')
| -rw-r--r-- | absl/synchronization/internal/kernel_timeout.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/absl/synchronization/internal/kernel_timeout.h b/absl/synchronization/internal/kernel_timeout.h index 92dffb7841eb..bb7080004c72 100644 --- a/absl/synchronization/internal/kernel_timeout.h +++ b/absl/synchronization/internal/kernel_timeout.h @@ -117,7 +117,7 @@ class KernelTimeout { // This header file may be included transitively by public header files, // so we define our own DWORD and INFINITE instead of getting them from // <intsafe.h> and <WinBase.h>. - typedef unsigned long DWord; + typedef unsigned long DWord; // NOLINT DWord InMillisecondsFromNow() const { constexpr DWord kInfinite = std::numeric_limits<DWord>::max(); if (!has_timeout()) { |