From eb64757302a38f013e8204b95450404d5dc3c103 Mon Sep 17 00:00:00 2001 From: Phil Willoughby Date: Wed, 24 Aug 2016 01:05:41 -0700 Subject: [PATCH] Fix a folly build failure with GCC5 Summary: I tested it doesn't break the gcc 4.9 and clang builds - I didn't try any other versions of anything. build[all] Reviewed By: meyering Differential Revision: D3757152 fbshipit-source-id: a126cd31cb89057dececfed1b265f452ee29fbff --- folly/Portability.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/folly/Portability.h b/folly/Portability.h index 12cff605..ff144522 100644 --- a/folly/Portability.h +++ b/folly/Portability.h @@ -231,7 +231,8 @@ namespace std { typedef ::max_align_t max_align_t; } // If the new c++ ABI is used, __cxx11 inline namespace needs to be added to // some types, e.g. std::list. #if _GLIBCXX_USE_CXX11_ABI -# define FOLLY_GLIBCXX_NAMESPACE_CXX11_BEGIN _GLIBCXX_BEGIN_NAMESPACE_CXX11 +#define FOLLY_GLIBCXX_NAMESPACE_CXX11_BEGIN \ + inline _GLIBCXX_BEGIN_NAMESPACE_CXX11 # define FOLLY_GLIBCXX_NAMESPACE_CXX11_END _GLIBCXX_END_NAMESPACE_CXX11 #else # define FOLLY_GLIBCXX_NAMESPACE_CXX11_BEGIN -- 2.34.1