[cpp.predefined] Bump value of __cpp_nontype_template_args to 201911L

for P1907R1, and remove __cpp_nontype_template_parameter_class to
indicate that the feature added by P0732R2 is no longer present in that
form.

Author: zygoloid

papers/nxxxx.md

@@ -43,6 +43,15 @@ CWG motion 2: [P1234R5 "Paper name"](http://wg21.link/p1234r5), resolving 3 NB c
 
 ...
 
+## Feature test macros
+
+The feature test macro `__cpp_nontype_template_parameter_class` has been removed
+to indicate that the feature added by [P0732R2](http://wg21.link/p0732r2)
+is no longer present in the same form.
+
+The value of the feature test macro `__cpp_nontype_template_args` has been increased
+to `201911L` to indicate support for [P1907R1](http://wg21.link/p1907r1).
+
 ## Disposition of editorial NB comments on C++ 2020 CD1
 
 Listed below are draft disposition for all comments that were

source/preprocessor.tex

@@ -1668,9 +1668,8 @@
 \defnxname{cpp_modules}                           & \tcode{201907L} \\ \rowsep
 \defnxname{cpp_namespace_attributes}              & \tcode{201411L} \\ \rowsep
 \defnxname{cpp_noexcept_function_type}            & \tcode{201510L} \\ \rowsep
-\defnxname{cpp_nontype_template_args}             & \tcode{201411L} \\ \rowsep
+\defnxname{cpp_nontype_template_args}             & \tcode{201911L} \\ \rowsep
 \defnxname{cpp_nontype_template_parameter_auto}   & \tcode{201606L} \\ \rowsep
-\defnxname{cpp_nontype_template_parameter_class}  & \tcode{201806L} \\ \rowsep
 \defnxname{cpp_nsdmi}                             & \tcode{200809L} \\ \rowsep
 \defnxname{cpp_range_based_for}                   & \tcode{201603L} \\ \rowsep
 \defnxname{cpp_raw_strings}                       & \tcode{200710L} \\ \rowsep