projects
/
folly.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ea05df
)
make_unique is ambiguous with c++14 for some platforms
author
Michael Lee
<mzlee@fb.com>
Thu, 5 Jan 2017 23:49:03 +0000
(15:49 -0800)
committer
Facebook Github Bot
<facebook-github-bot@users.noreply.github.com>
Fri, 6 Jan 2017 00:03:26 +0000
(16:03 -0800)
Summary: Missing compatibility case for Android
Reviewed By: yfeldblum
Differential Revision:
D4384944
fbshipit-source-id:
0b3e43fb284b6a71c6ae2a2162d1ea7cb99bc817
folly/Memory.h
patch
|
blob
|
history
diff --git
a/folly/Memory.h
b/folly/Memory.h
index 2c99b5eb528ec5161c4e6606ff3984bd5dbd81b4..5e15d4a0a90ffafe84e1a67c8db82266c62d7ae5 100644
(file)
--- a/
folly/Memory.h
+++ b/
folly/Memory.h
@@
-38,6
+38,7
@@
namespace folly {
#if __cplusplus >= 201402L || \
(defined __cpp_lib_make_unique && __cpp_lib_make_unique >= 201304L) || \
+ (defined __ANDROID__ && __cplusplus >= 201300L) || \
(defined(_MSC_VER) && _MSC_VER >= 1900)
/* using override */ using std::make_unique;