diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2022-11-05 17:13:30 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2022-11-05 17:27:47 +0000 |
| commit | 0a630f6d1fd84e90082613d21829f38f9bb1c29f (patch) | |
| tree | 099f5dca172b12059b83d9fd60281e214ac91286 | |
| parent | 4fb516176c179602f98740b5f7f791a87260f611 (diff) | |
| download | swig-0a630f6d1fd84e90082613d21829f38f9bb1c29f.tar.gz | |
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
| -rw-r--r-- | Examples/test-suite/common.mk | 2 | ||||
| -rw-r--r-- | Examples/test-suite/cpp17_enable_if_t.i (renamed from Examples/test-suite/cpp14_enable_if_t.i) | 2 | ||||
| -rw-r--r-- | Examples/test-suite/java/cpp17_enable_if_t_runme.java (renamed from Examples/test-suite/java/cpp14_enable_if_t_runme.java) | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index c52a74dd3..d26f2505c 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -639,13 +639,13 @@ CPP11_TEST_BROKEN = \ # C++14 test cases. CPP14_TEST_CASES += \ cpp14_binary_integer_literals \ - cpp14_enable_if_t \ # Broken C++14 test cases. CPP14_TEST_BROKEN = \ # C++17 test cases. CPP17_TEST_CASES += \ + cpp17_enable_if_t \ cpp17_hex_floating_literals \ cpp17_nested_namespaces \ cpp17_nspace_nested_namespaces \ diff --git a/Examples/test-suite/cpp14_enable_if_t.i b/Examples/test-suite/cpp17_enable_if_t.i index a2e483380..307237549 100644 --- a/Examples/test-suite/cpp14_enable_if_t.i +++ b/Examples/test-suite/cpp17_enable_if_t.i @@ -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 diff --git a/Examples/test-suite/java/cpp14_enable_if_t_runme.java b/Examples/test-suite/java/cpp17_enable_if_t_runme.java index ade061be3..25569f303 100644 --- a/Examples/test-suite/java/cpp14_enable_if_t_runme.java +++ b/Examples/test-suite/java/cpp17_enable_if_t_runme.java @@ -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 { try { - System.loadLibrary("cpp14_enable_if_t"); + System.loadLibrary("cpp17_enable_if_t"); } 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.exit(1); @@ -13,7 +13,7 @@ public class cpp14_enable_if_t_runme { 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"); } } |