summaryrefslogtreecommitdiffstats
path: root/libcxx/include/initializer_list
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2018-07-11 23:14:33 +0000
committerLouis Dionne <ldionne@apple.com>2018-07-11 23:14:33 +0000
commitdc7200b486b6c5b5229abcee97c160145cc3d955 (patch)
treef4373ca956f1ba3ccf7bde5e1a396f9819472f60 /libcxx/include/initializer_list
parent62c76db4eec8ef64a03c4b077045893bebfc38e9 (diff)
downloadbcm5719-llvm-dc7200b486b6c5b5229abcee97c160145cc3d955.tar.gz
bcm5719-llvm-dc7200b486b6c5b5229abcee97c160145cc3d955.zip
[libc++] Take 2: Replace uses of _LIBCPP_ALWAYS_INLINE by _LIBCPP_INLINE_VISIBILITY
Summary: We never actually mean to always inline a function -- all the uses of the macro I could find are actually attempts to control the visibility of symbols. This is better described by _LIBCPP_INLINE_VISIBILITY, which is actually always defined the same. This change is orthogonal to the decision of what we're actually going to do with _LIBCPP_INLINE_VISIBILITY -- it just simplifies things by having one canonical way of doing things. Note that this commit had originally been applied in r336369 and then reverted in r336382 because of unforeseen problems. Both of these problems have now been fixed. Reviewers: EricWF, mclow.lists Subscribers: christof, dexonsmith, erikvanderpoel Differential Revision: https://reviews.llvm.org/D48892 llvm-svn: 336866
Diffstat (limited to 'libcxx/include/initializer_list')
-rw-r--r--libcxx/include/initializer_list10
1 files changed, 5 insertions, 5 deletions
diff --git a/libcxx/include/initializer_list b/libcxx/include/initializer_list
index 8c234aaaab2..b934637b83d 100644
--- a/libcxx/include/initializer_list
+++ b/libcxx/include/initializer_list
@@ -61,7 +61,7 @@ class _LIBCPP_TEMPLATE_VIS initializer_list
const _Ep* __begin_;
size_t __size_;
- _LIBCPP_ALWAYS_INLINE
+ _LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR_AFTER_CXX11
initializer_list(const _Ep* __b, size_t __s) _NOEXCEPT
: __begin_(__b),
@@ -76,19 +76,19 @@ public:
typedef const _Ep* iterator;
typedef const _Ep* const_iterator;
- _LIBCPP_ALWAYS_INLINE
+ _LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR_AFTER_CXX11
initializer_list() _NOEXCEPT : __begin_(nullptr), __size_(0) {}
- _LIBCPP_ALWAYS_INLINE
+ _LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR_AFTER_CXX11
size_t size() const _NOEXCEPT {return __size_;}
- _LIBCPP_ALWAYS_INLINE
+ _LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR_AFTER_CXX11
const _Ep* begin() const _NOEXCEPT {return __begin_;}
- _LIBCPP_ALWAYS_INLINE
+ _LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR_AFTER_CXX11
const _Ep* end() const _NOEXCEPT {return __begin_ + __size_;}
};
OpenPOWER on IntegriCloud