diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:42:27 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:44:49 -0700 |
| commit | c3bc155aceda36ecb01cde2367a3b427f2d7ce40 (patch) | |
| tree | 195d74745dad40a57d49bf718f50c7751336a405 /src/google/protobuf/map.h | |
| parent | b0f661181d10bddc08e380992590a1cdd92be92b (diff) | |
| parent | eb65c69e14fb711208ad5111cb9672f00864bb6d (diff) | |
Merge branch 'master' of github.com:google/protobuf
Change-Id: If3fb07754a734bae610d95124528e073515ac525
Diffstat (limited to 'src/google/protobuf/map.h')
| -rw-r--r-- | src/google/protobuf/map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h index 163ce9dc..d928b7a7 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -172,7 +172,7 @@ class Map { !defined(GOOGLE_PROTOBUF_OS_NACL) && !defined(GOOGLE_PROTOBUF_OS_ANDROID) template<class NodeType, class... Args> void construct(NodeType* p, Args&&... args) { - new (p) NodeType(std::forward<Args>(args)...); + new ((void*)p) NodeType(std::forward<Args>(args)...); } template<class NodeType> |