projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2510a31
)
memory_resource still needs init_priority when built with GCC 4.9
author
Eric Fiselier
<eric@efcs.ca>
Sat, 3 Sep 2016 07:05:40 +0000
(07:05 +0000)
committer
Eric Fiselier
<eric@efcs.ca>
Sat, 3 Sep 2016 07:05:40 +0000
(07:05 +0000)
llvm-svn: 280585
libcxx/src/experimental/memory_resource.cpp
patch
|
blob
|
history
diff --git
a/libcxx/src/experimental/memory_resource.cpp
b/libcxx/src/experimental/memory_resource.cpp
index
c088059
..
3e87a2d
100644
(file)
--- a/
libcxx/src/experimental/memory_resource.cpp
+++ b/
libcxx/src/experimental/memory_resource.cpp
@@
-72,10
+72,8
@@
union ResourceInitHelper {
// Only in C++11 is "init_priority" needed to ensure initialization order.
#if _LIBCPP_STD_VER > 11
_LIBCPP_SAFE_STATIC
-#else
- __attribute__((init_priority (101)))
#endif
-ResourceInitHelper res_init;
+ResourceInitHelper res_init
__attribute__((init_priority (101)))
;
} // end namespace