summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2015-10-21 21:20:25 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2015-10-21 21:20:25 +0000
commitd05226d584ccc9de1594dc2927c93545414a8037 (patch)
tree18441a7f644e747bf72631b6b04c693752b706a6
parent13f421d5605ccac3dae6a07ddcf3bbddaf7f2209 (diff)
downloadgcc-d05226d584ccc9de1594dc2927c93545414a8037.tar.gz
* include/std/type_traits (__cpp_lib_bool_constant): Define.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229152 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/std/type_traits2
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f6c35e69359..9444dd308d2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-21 Jonathan Wakely <jwakely@redhat.com>
+
+ * include/std/type_traits (__cpp_lib_bool_constant): Define.
+
2015-10-16 Jonathan Wakely <jwakely@redhat.com>
* doc/xml/manual/configure.xml: Document
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 55ca9167b7b..e291047ad8b 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -93,7 +93,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
using __bool_constant = integral_constant<bool, __v>;
#if __cplusplus > 201402L
-// TODO: #define __cpp_lib_bool_constant 201505
+# define __cpp_lib_bool_constant 201505
template<bool __v>
using bool_constant = integral_constant<bool, __v>;
#endif