summaryrefslogtreecommitdiffstats
path: root/libcxx/include/algorithm
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2012-04-02 00:40:41 +0000
committerHoward Hinnant <hhinnant@apple.com>2012-04-02 00:40:41 +0000
commit788c9979d9fff3f0bc7419c1ae9c0f0ff7f51ce8 (patch)
treec1391c35d0986e13e42fcb31e4a9b8951a77f8f4 /libcxx/include/algorithm
parent0527c6207af5de565bbd77e64f953bbc785cee8d (diff)
downloadbcm5719-llvm-788c9979d9fff3f0bc7419c1ae9c0f0ff7f51ce8.tar.gz
bcm5719-llvm-788c9979d9fff3f0bc7419c1ae9c0f0ff7f51ce8.zip
This is an initial commit of constexpr support as proposed by Richard Smith. This by no means completes constexpr support. Indeed, it hardly scratches the surface. All it does is lay the foundation in <__config> and changes those few places in the library that are already using that foundation.
llvm-svn: 153856
Diffstat (limited to 'libcxx/include/algorithm')
-rw-r--r--libcxx/include/algorithm4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm
index f9c6843a60a..68e989a0be1 100644
--- a/libcxx/include/algorithm
+++ b/libcxx/include/algorithm
@@ -2712,8 +2712,8 @@ public:
result_type operator()();
- static constexpr result_type min() {return _Min;}
- static constexpr result_type max() {return _Max;}
+ static _LIBCPP_CONSTEXPR result_type min() {return _Min;}
+ static _LIBCPP_CONSTEXPR result_type max() {return _Max;}
friend __rs_default __rs_get();
};
OpenPOWER on IntegriCloud