aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google
diff options
context:
space:
mode:
authorGravatar TeBoring <teboring@google.com>2015-05-26 15:50:06 -0700
committerGravatar TeBoring <teboring@google.com>2015-05-26 15:50:06 -0700
commit9250fbaead7ff5208697d57859ac8e8fd2721786 (patch)
treea3af00ed487fb9fda6980854f59626be4f9456ad /src/google
parent8908cf16fe81f42c766fdf067b1da4554f54ed87 (diff)
In std11, on mac, operator new doesn't take right reference.
Diffstat (limited to 'src/google')
-rw-r--r--src/google/protobuf/map.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index 543b45d7..58a1817a 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -167,7 +167,7 @@ class Map {
}
}
-#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L && !defined(GOOGLE_PROTOBUF_OS_APPLE)
template<class NodeType, class... Args>
void construct(NodeType* p, Args&&... args) {
new (p) NodeType(std::forward<Args>(args)...);