From: Michael Lee <mzlee@fb.com>
Date: Thu, 5 Jan 2017 23:49:03 +0000 (-0800)
Subject: make_unique is ambiguous with c++14 for some platforms
X-Git-Tag: v2017.03.06.00~131
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=918988e5129b7e61b42d5077c0175ca27cb8371d;p=folly.git

make_unique is ambiguous with c++14 for some platforms

Summary: Missing compatibility case for Android

Reviewed By: yfeldblum

Differential Revision: D4384944

fbshipit-source-id: 0b3e43fb284b6a71c6ae2a2162d1ea7cb99bc817
---

diff --git a/folly/Memory.h b/folly/Memory.h
index 2c99b5eb..5e15d4a0 100644
--- 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;