diff options
author | Abseil Team <absl-team@google.com> | 2017-09-29T15·44-0700 |
---|---|---|
committer | Derek Mauro <dmauro@google.com> | 2017-09-29T15·50-0400 |
commit | 8d8dcb0ae550fbfdbd7392a3c9d2c5c596bdcde3 (patch) | |
tree | a6ac55aa5c82e4170d059d0bbdeb10752c76742f /absl/base/optimization.h | |
parent | cdf20caa491f59c0a35a8d8fbec0d948e4bc7e4c (diff) |
Changes imported from Abseil "staging" branch:
- b76f5d50e1cb55050ef6004d6097dfdf0a806ff5 Fix ABSL_HAVE_THREAD_LOCAL for iOS < 8.0. by Matt Armstrong <marmstrong@google.com> - 1dc71788a3f4ef601e03cbea59e36901479cde35 Add missing #include <intrin.h> to use __nop() on MSVC. by Derek Mauro <dmauro@google.com> - f63ca6c7e87a7961912995b518b93af41b04bfa1 Fix typo (implict -> implicit) by Abseil Team <absl-team@google.com> - 8096006dc52368f166ccd22e25fcee334e142508 Fix a typo. by Abseil Team <absl-team@google.com> - c673a4a59790329fab33536caed6733dc03ec2a1 Add missing ":" in TODO. by Abseil Team <absl-team@google.com> - 8125d214356501af0f3a8b3bb577eed083f0493f Fix comment nit. by Abseil Team <absl-team@google.com> GitOrigin-RevId: b76f5d50e1cb55050ef6004d6097dfdf0a806ff5 Change-Id: I0168eb0c92b20ece2fe5ee54573c7720d00fd0b3
Diffstat (limited to 'absl/base/optimization.h')
-rw-r--r-- | absl/base/optimization.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/absl/base/optimization.h b/absl/base/optimization.h index db8beafa3f2e..aaaffa495a9a 100644 --- a/absl/base/optimization.h +++ b/absl/base/optimization.h @@ -46,6 +46,7 @@ // GCC will not tail call given inline volatile assembly. #define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __asm__ __volatile__("") #elif defined(_MSC_VER) +#include <intrin.h> // The __nop() intrinsic blocks the optimisation. #define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __nop() #else |