about summary refs log tree commit diff
path: root/absl/memory/memory.h
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2017-11-08T17·43-0800
committerkatzdm <katzdm@google.com>2017-11-08T18·52-0500
commit9850abf25d8efcdc1ff752f1eeef13b640c4ead4 (patch)
tree7600a3c80913c885c59d5ca4617edd36ab100af7 /absl/memory/memory.h
parentbadd8bd27f216aee9d9f026e697e7281b5932fee (diff)
Changes imported from Abseil "staging" branch:
  - 55a89fda61ddf8aa76d0a3b6bc44bf6b5b6eadfc Internal cleanup by Abseil Team <absl-team@google.com>
  - b7646f979ee40c5716833692f2eb24b8058cf4c8 Internal cleanup by Gennadiy Rozental <rogeeff@google.com>
  - 12a4051b0ea91c6a6211f738fa24e1bc7064c09a Merging changes from https://github.com/abseil/abseil-cpp... by Daniel Katz <katzdm@google.com>
  - 2e259588d62118a70837a3d8408cb6c763f48420 Replace EXPECT_TRUE(StrContains(...)) with an assert exam... by Abseil Team <absl-team@google.com>
  - 8f7d251b3486f2b03dc712ad0822b9dc87a7964b Make Uint128(High|Low)64 constexpr. by Alex Strelnikov <strel@google.com>
  - 955fd38a23896e003105defc0ef221a2c10d392e Internal change by Jon Cohen <cohenjon@google.com>

GitOrigin-RevId: 55a89fda61ddf8aa76d0a3b6bc44bf6b5b6eadfc
Change-Id: Ia062fe8a0559aa3ace3736d2a53f6da13af40b2c
Diffstat (limited to 'absl/memory/memory.h')
-rw-r--r--absl/memory/memory.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/absl/memory/memory.h b/absl/memory/memory.h
index 15cd85f4e1ed..22d44b9e46fe 100644
--- a/absl/memory/memory.h
+++ b/absl/memory/memory.h
@@ -30,6 +30,7 @@
 #include <type_traits>
 #include <utility>
 
+#include "absl/base/macros.h"
 #include "absl/meta/type_traits.h"
 
 namespace absl {