diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-04-11 23:37:42 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-04-11 23:37:42 -0700 |
| commit | 814685ca2cd9280ca401e1842fd6311440921a0a (patch) | |
| tree | 5c2cac2b5ba07fe345fdda74c270b32c8f7b9331 /src/google/protobuf/metadata.h | |
| parent | 3ffbdd712f0413ce4964d626c5e10533f1f74893 (diff) | |
| parent | 3c4ce528c63f4dc39d15de963020472980ee7229 (diff) | |
| download | protobuf-814685ca2cd9280ca401e1842fd6311440921a0a.tar.gz protobuf-814685ca2cd9280ca401e1842fd6311440921a0a.tar.bz2 protobuf-814685ca2cd9280ca401e1842fd6311440921a0a.zip | |
Merge pull request #1397 from google/internal-merge
Internal merge
Diffstat (limited to 'src/google/protobuf/metadata.h')
| -rw-r--r-- | src/google/protobuf/metadata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/metadata.h b/src/google/protobuf/metadata.h index 219645d3..fdee150b 100644 --- a/src/google/protobuf/metadata.h +++ b/src/google/protobuf/metadata.h @@ -56,7 +56,7 @@ namespace internal { // The tagged pointer uses the LSB to disambiguate cases, and uses bit 0 == 0 to // indicate an arena pointer and bit 0 == 1 to indicate a UFS+Arena-container // pointer. -class InternalMetadataWithArena { +class LIBPROTOBUF_EXPORT InternalMetadataWithArena { public: InternalMetadataWithArena() : ptr_(NULL) {} explicit InternalMetadataWithArena(Arena* arena) |