Add Optional::value_or

[folly.git] / folly / Portability.h

diff --git a/folly/Portability.h b/folly/Portability.h
index 51642a1c7649e9869c93604a3b3c030b0f1c71dc..61b9eb22ff30234b47d969fffddf01ad6e6409b7 100644 (file)
--- a/folly/Portability.h
+++ b/folly/Portability.h
@@ -21,6 +21,10 @@
 #include "folly-config.h"
 #endif
 
+#ifdef FOLLY_PLATFORM_CONFIG
+#include FOLLY_PLATFORM_CONFIG
+#endif
+
 #if FOLLY_HAVE_FEATURES_H
 #include <features.h>
 #endif
@@ -169,6 +173,7 @@ struct MaxAlign { char c; } __attribute__((aligned));
 // the 'std' namespace; the latter uses inline namepsaces. Wrap this decision
 // up in a macro to make forward-declarations easier.
 #if FOLLY_USE_LIBCPP
+#include <__config>
 #define FOLLY_NAMESPACE_STD_BEGIN     _LIBCPP_BEGIN_NAMESPACE_STD
 #define FOLLY_NAMESPACE_STD_END       _LIBCPP_END_NAMESPACE_STD
 #else