From: Phil Willoughby <philwill@fb.com>
Date: Wed, 24 Aug 2016 08:05:41 +0000 (-0700)
Subject: Fix a folly build failure with GCC5
X-Git-Tag: v2016.08.29.00~21
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eb64757302a38f013e8204b95450404d5dc3c103;p=folly.git

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
---

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