diff options
author | Feng Xiao <xiaofeng@google.com> | 2015-09-10 12:46:21 -0700 |
---|---|---|
committer | Feng Xiao <xiaofeng@google.com> | 2015-09-10 12:46:21 -0700 |
commit | fbabf987e671aa37d11e1163e0175f99b32df5fe (patch) | |
tree | 284b3782fe56020e06f74eda710060f74fd92f11 /src | |
parent | c8c5fed544b20b8ca865113d858e9b98deb00a4b (diff) | |
parent | 5d412c47d97fd753ec8ed560ddd276f65cf34de0 (diff) | |
download | protobuf-fbabf987e671aa37d11e1163e0175f99b32df5fe.tar.gz protobuf-fbabf987e671aa37d11e1163e0175f99b32df5fe.tar.bz2 protobuf-fbabf987e671aa37d11e1163e0175f99b32df5fe.zip |
Merge pull request #769 from pkasting/metadata
Fix compile failures building protobuf DLLs on MSVC in Chromium's cod…
Diffstat (limited to 'src')
-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 fdee150b..219645d3 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 LIBPROTOBUF_EXPORT InternalMetadataWithArena { +class InternalMetadataWithArena { public: InternalMetadataWithArena() : ptr_(NULL) {} explicit InternalMetadataWithArena(Arena* arena) |