rename cpp14_enable_if_t to cpp17_enable_if_t
std::enable_if_t is in C++14, but std::is_integral_v is in C++17
This commit is contained in:
parent
8ab66c3125
commit
86b3e60617
3 changed files with 6 additions and 6 deletions
|
|
@ -639,13 +639,13 @@ CPP11_TEST_BROKEN = \
|
||||||
# C++14 test cases.
|
# C++14 test cases.
|
||||||
CPP14_TEST_CASES += \
|
CPP14_TEST_CASES += \
|
||||||
cpp14_binary_integer_literals \
|
cpp14_binary_integer_literals \
|
||||||
cpp14_enable_if_t \
|
|
||||||
|
|
||||||
# Broken C++14 test cases.
|
# Broken C++14 test cases.
|
||||||
CPP14_TEST_BROKEN = \
|
CPP14_TEST_BROKEN = \
|
||||||
|
|
||||||
# C++17 test cases.
|
# C++17 test cases.
|
||||||
CPP17_TEST_CASES += \
|
CPP17_TEST_CASES += \
|
||||||
|
cpp17_enable_if_t \
|
||||||
cpp17_hex_floating_literals \
|
cpp17_hex_floating_literals \
|
||||||
cpp17_nested_namespaces \
|
cpp17_nested_namespaces \
|
||||||
cpp17_nspace_nested_namespaces \
|
cpp17_nspace_nested_namespaces \
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
%module cpp14_enable_if_t
|
%module cpp17_enable_if_t
|
||||||
|
|
||||||
// test use of enable_if_t but without full %template instantiation, that is no enable_if_t definition is parsed
|
// test use of enable_if_t but without full %template instantiation, that is no enable_if_t definition is parsed
|
||||||
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
import cpp14_enable_if_t.*;
|
import cpp17_enable_if_t.*;
|
||||||
|
|
||||||
public class cpp14_enable_if_t_runme {
|
public class cpp17_enable_if_t_runme {
|
||||||
|
|
||||||
static {
|
static {
|
||||||
try {
|
try {
|
||||||
System.loadLibrary("cpp14_enable_if_t");
|
System.loadLibrary("cpp17_enable_if_t");
|
||||||
} catch (UnsatisfiedLinkError e) {
|
} catch (UnsatisfiedLinkError e) {
|
||||||
System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
|
System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
|
|
@ -13,7 +13,7 @@ public class cpp14_enable_if_t_runme {
|
||||||
|
|
||||||
public static void main(String argv[])
|
public static void main(String argv[])
|
||||||
{
|
{
|
||||||
if (cpp14_enable_if_t.enableif5(10, 20) != 30)
|
if (cpp17_enable_if_t.enableif5(10, 20) != 30)
|
||||||
throw new RuntimeException("enableif5 not working");
|
throw new RuntimeException("enableif5 not working");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue