From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Sat, 10 Oct 2015 02:09:42 +0000 (-0700)
Subject: Fix Build: GCC 4.9 has std::make_unique but not __cplusplus >= 201402L
X-Git-Tag: deprecate-dynamic-initializer~343
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3a7ad48395acfe69ed4df89adce7ddd52aee26c4;p=folly.git

Fix Build: GCC 4.9 has std::make_unique but not __cplusplus >= 201402L

Summary: [Folly] Fix Build: GCC 4.9 has `std::make_unique` but not `__cplusplus >= 201402L`.

Reviewed By: @igorsugak

Differential Revision: D2528584

fb-gh-sync-id: 9ad0567429698fb1320ad4066ee06add31acbd57
---

diff --git a/folly/Memory.h b/folly/Memory.h
index eadc1c81..374f1e0e 100644
--- a/folly/Memory.h
+++ b/folly/Memory.h
@@ -37,7 +37,8 @@ namespace folly {
  * @author Xu Ning (xning@fb.com)
  */
 
-#if __cplusplus >= 201402L
+#if __cplusplus >= 201402L || \
+    defined __cpp_lib_make_unique && __cpp_lib_make_unique >= 201304L
 
 /* using override */ using std::make_unique;