Commit fbabf987 authored by Feng Xiao's avatar Feng Xiao

Merge pull request #769 from pkasting/metadata

Fix compile failures building protobuf DLLs on MSVC in Chromium's cod…
parents c8c5fed5 5d412c47
...@@ -56,7 +56,7 @@ namespace internal { ...@@ -56,7 +56,7 @@ namespace internal {
// The tagged pointer uses the LSB to disambiguate cases, and uses bit 0 == 0 to // 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 // indicate an arena pointer and bit 0 == 1 to indicate a UFS+Arena-container
// pointer. // pointer.
class LIBPROTOBUF_EXPORT InternalMetadataWithArena { class InternalMetadataWithArena {
public: public:
InternalMetadataWithArena() : ptr_(NULL) {} InternalMetadataWithArena() : ptr_(NULL) {}
explicit InternalMetadataWithArena(Arena* arena) explicit InternalMetadataWithArena(Arena* arena)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment