From 5cb90354d18c4edc1dcc11cf3674542409597863 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 18 Aug 2014 11:43:36 -0700
Subject: [PATCH 1/1] 2014-08-18 Thiago Macieira <thiago.macieira@intel.com>
* init.c (cpp_init_builtins ()): Set the SD-6 feature defines
in C++11 and C++14 modes.
---
libcpp/init.c | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 42 insertions(+), 8 deletions(-)
@@ -485,14 +485,48 @@ cpp_init_builtins (cpp_reader *pfile, int hosted)
if (CPP_OPTION (pfile, cplusplus))
{
- if (CPP_OPTION (pfile, lang) == CLK_CXX1Y
- || CPP_OPTION (pfile, lang) == CLK_GNUCXX1Y)
- _cpp_define_builtin (pfile, "__cplusplus 201300L");
- else if (CPP_OPTION (pfile, lang) == CLK_CXX11
- || CPP_OPTION (pfile, lang) == CLK_GNUCXX11)
- _cpp_define_builtin (pfile, "__cplusplus 201103L");
- else
- _cpp_define_builtin (pfile, "__cplusplus 199711L");
+ switch (CPP_OPTION (pfile, lang))
+ {
+ case CLK_GNUCXX1Y:
+ case CLK_CXX1Y:
+ _cpp_define_builtin (pfile, "__cpp_init_captures 201304");
+ _cpp_define_builtin (pfile, "__cpp_decltype_auto 201304");
+ _cpp_define_builtin (pfile, "__cpp_return_type_deduction 201304");
+ if (CPP_OPTION (pfile, lang) == CLK_CXX1Y
+ || CPP_OPTION (pfile, lang) == CLK_GNUCXX1Y)
+ _cpp_define_builtin (pfile, "__cplusplus 201300L");
+ /* fall through */
+
+ case CLK_GNUCXX11:
+ case CLK_CXX11:
+ _cpp_define_builtin (pfile, "__cpp_unicode_characters 200704");
+ _cpp_define_builtin (pfile, "__cpp_unicode_literals 200710");
+ _cpp_define_builtin (pfile, "__cpp_unicode_literals 200710");
+ _cpp_define_builtin (pfile, "__cpp_user_defined_literals 200809");
+ _cpp_define_builtin (pfile, "__cpp_lambdas 200907");
+ _cpp_define_builtin (pfile, "__cpp_static_assert 200410");
+ _cpp_define_builtin (pfile, "__cpp_decltype 200707");
+ _cpp_define_builtin (pfile, "__cpp_attributes 200809");
+ _cpp_define_builtin (pfile, "__cpp_rvalue_references 200610");
+ _cpp_define_builtin (pfile, "__cpp_variadic_templates 200704");
+ if (CPP_OPTION (pfile, lang) == CLK_CXX11
+ || CPP_OPTION (pfile, lang) == CLK_GNUCXX11)
+ {
+ _cpp_define_builtin (pfile, "__cplusplus 201103L");
+ _cpp_define_builtin (pfile, "__cpp_constexpr 200704");
+ }
+ if (CPP_OPTION (pfile, lang) == CLK_CXX11)
+ break;
+ /* fall through */
+
+ default:
+ if (CPP_OPTION (pfile, lang) == CLK_CXX98
+ || CPP_OPTION (pfile, lang) == CLK_GNUCXX)
+ _cpp_define_builtin (pfile, "__cplusplus 199711L");
+ if (CPP_OPTION (pfile, lang) == CLK_CXX98)
+ break;
+ _cpp_define_builtin (pfile, "__cpp_binary_literals 201304");
+ }
}
else if (CPP_OPTION (pfile, lang) == CLK_ASM)
_cpp_define_builtin (pfile, "__ASSEMBLER__ 1");
--
1.8.4.5