summaryrefslogtreecommitdiffstats
path: root/libcxx/include/array
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2012-07-20 19:20:49 +0000
committerHoward Hinnant <hhinnant@apple.com>2012-07-20 19:20:49 +0000
commit397717b7c8b7576fbdd2f5b7ec7dec531f305c98 (patch)
tree295377c332bdaf674ea305490ac69bdf38535a0a /libcxx/include/array
parent931644bfec6122fffc436b9a2bfddf4dce847c76 (diff)
downloadbcm5719-llvm-397717b7c8b7576fbdd2f5b7ec7dec531f305c98.tar.gz
bcm5719-llvm-397717b7c8b7576fbdd2f5b7ec7dec531f305c98.zip
constexpr applied to <array>.
llvm-svn: 160564
Diffstat (limited to 'libcxx/include/array')
-rw-r--r--libcxx/include/array8
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/array b/libcxx/include/array
index c11f4bd74f5..029bfd00a5c 100644
--- a/libcxx/include/array
+++ b/libcxx/include/array
@@ -55,7 +55,7 @@ struct array
// capacity:
constexpr size_type size() const noexcept;
constexpr size_type max_size() const noexcept;
- bool empty() const noexcept;
+ constexpr bool empty() const noexcept;
// element access:
reference operator[](size_type n);
@@ -173,11 +173,11 @@ struct _LIBCPP_VISIBLE array
// capacity:
_LIBCPP_INLINE_VISIBILITY
- /*constexpr*/ size_type size() const _NOEXCEPT {return _Size;}
+ _LIBCPP_CONSTEXPR size_type size() const _NOEXCEPT {return _Size;}
_LIBCPP_INLINE_VISIBILITY
- /*constexpr*/ size_type max_size() const _NOEXCEPT {return _Size;}
+ _LIBCPP_CONSTEXPR size_type max_size() const _NOEXCEPT {return _Size;}
_LIBCPP_INLINE_VISIBILITY
- bool empty() const _NOEXCEPT {return _Size == 0;}
+ _LIBCPP_CONSTEXPR bool empty() const _NOEXCEPT {return _Size == 0;}
// element access:
_LIBCPP_INLINE_VISIBILITY reference operator[](size_type __n) {return __elems_[__n];}
OpenPOWER on IntegriCloud