diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-09-12 10:32:01 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-09-14 10:03:57 -0700 |
| commit | 13fd045dbb2b4dacea32be162a41d5a4b0d1802f (patch) | |
| tree | c219e7eb18b82523e36c6748861c403a14ea66ae /src/google/protobuf/arena_impl.h | |
| parent | d1bc27caef8377a710370189675cb0958443e8f1 (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/arena_impl.h')
| -rw-r--r-- | src/google/protobuf/arena_impl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/google/protobuf/arena_impl.h b/src/google/protobuf/arena_impl.h index b7f0c7b6..5fa2475f 100644 --- a/src/google/protobuf/arena_impl.h +++ b/src/google/protobuf/arena_impl.h @@ -42,6 +42,8 @@ #include <google/protobuf/stubs/mutex.h> #include <google/protobuf/stubs/type_traits.h> +#include <google/protobuf/stubs/port.h> + namespace google { namespace protobuf { @@ -131,7 +133,8 @@ class LIBPROTOBUF_EXPORT ArenaImpl { // aligned at a multiple of 8 bytes. size_t pos; size_t size; // total size of the block. - GOOGLE_ATTRIBUTE_ALWAYS_INLINE size_t avail() const { return size - pos; } + GOOGLE_PROTOBUF_ATTRIBUTE_ALWAYS_INLINE + size_t avail() const { return size - pos; } // data follows }; |