diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
| commit | 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 (patch) | |
| tree | e575738adf52d24b883cca5e8928a5ded31caba1 /src/google/protobuf/arena.cc | |
| parent | e7746f487cb9cca685ffb1b3d7dccc5554b618a4 (diff) | |
| download | protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.gz protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.bz2 protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.zip | |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/arena.cc')
| -rw-r--r-- | src/google/protobuf/arena.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/arena.cc b/src/google/protobuf/arena.cc index c117c9e5..1d81c322 100644 --- a/src/google/protobuf/arena.cc +++ b/src/google/protobuf/arena.cc @@ -38,12 +38,12 @@ #include <sanitizer/asan_interface.h> #endif // ADDRESS_SANITIZER -#include <google/protobuf/stubs/port.h> +#include <google/protobuf/port_def.inc> -namespace google { static const size_t kMinCleanupListElements = 8; static const size_t kMaxCleanupListElements = 64; // 1kB on 64-bit. +namespace google { namespace protobuf { namespace internal { @@ -187,8 +187,8 @@ void ArenaImpl::AddCleanupFallback(void* elem, void (*cleanup)(void*)) { GetSerialArena()->AddCleanup(elem, cleanup); } -inline GOOGLE_PROTOBUF_ATTRIBUTE_ALWAYS_INLINE -bool ArenaImpl::GetSerialArenaFast(ArenaImpl::SerialArena** arena) { +inline GOOGLE_PROTOBUF_ATTRIBUTE_ALWAYS_INLINE bool +ArenaImpl::GetSerialArenaFast(ArenaImpl::SerialArena** arena) { // If this thread already owns a block in this arena then try to use that. // This fast path optimizes the case where multiple threads allocate from the // same arena. |