From 918988e5129b7e61b42d5077c0175ca27cb8371d Mon Sep 17 00:00:00 2001 From: Michael Lee Date: Thu, 5 Jan 2017 15:49:03 -0800 Subject: [PATCH] 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 --- folly/Memory.h | 1 + 1 file changed, 1 insertion(+) 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; -- 2.34.1