projects
/
folly.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d37864
)
Fix a folly build failure with GCC5
author
Phil Willoughby
<philwill@fb.com>
Wed, 24 Aug 2016 08:05:41 +0000
(
01:05
-0700)
committer
Facebook Github Bot
<facebook-github-bot-bot@fb.com>
Wed, 24 Aug 2016 08:08:45 +0000
(
01:08
-0700)
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
patch
|
blob
|
history
diff --git
a/folly/Portability.h
b/folly/Portability.h
index 12cff605f58128841d4a8f6967ca7f6037bc4905..ff1445224bcda462b5f4a1edb3b9421cc6f3f01e 100644
(file)
--- 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