diff options
| author | Brad King <brad.king@kitware.com> | 2023-11-17 13:18:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-11-17 13:18:41 (GMT) |
| commit | 52ce26b9d3ba8856547952acf0a1bd1fc99dbb76 (patch) | |
| tree | df6dcbb51db7b095403b20f54af5cd0c30c9299f | |
| parent | 5595976c11b284a76b6b0a0c651bc630e38db291 (diff) | |
| parent | f2cc0ef2ed5e44348f1a417179d7b1eb4a481198 (diff) | |
| download | CMake-52ce26b9d3ba8856547952acf0a1bd1fc99dbb76.zip CMake-52ce26b9d3ba8856547952acf0a1bd1fc99dbb76.tar.gz CMake-52ce26b9d3ba8856547952acf0a1bd1fc99dbb76.tar.bz2 | |
Merge topic 'update-kwiml' into release-3.28
f2cc0ef2ed Merge branch 'upstream-KWIML' into update-kwiml
83dd9be285 KWIML 2023-11-16 (500bc253)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8978
| -rw-r--r-- | Utilities/KWIML/include/kwiml/abi.h | 2 | ||||
| -rw-r--r-- | Utilities/KWIML/include/kwiml/int.h | 2 | ||||
| -rw-r--r-- | Utilities/KWIML/test/test_int_format.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Utilities/KWIML/include/kwiml/abi.h b/Utilities/KWIML/include/kwiml/abi.h index 0437854..cefe9ce 100644 --- a/Utilities/KWIML/include/kwiml/abi.h +++ b/Utilities/KWIML/include/kwiml/abi.h @@ -494,7 +494,7 @@ suppression macro KWIML_ABI_NO_VERIFY was defined. #if defined(_MSC_VER) # pragma warning (push) -# pragma warning (disable:4309) /* static_cast trunction of constant value */ +# pragma warning (disable:4309) /* static_cast truncation of constant value */ # pragma warning (disable:4310) /* cast truncates constant value */ #endif diff --git a/Utilities/KWIML/include/kwiml/int.h b/Utilities/KWIML/include/kwiml/int.h index 49da373..d50c518 100644 --- a/Utilities/KWIML/include/kwiml/int.h +++ b/Utilities/KWIML/include/kwiml/int.h @@ -1016,7 +1016,7 @@ An includer may test the following macros after inclusion: #if defined(_MSC_VER) # pragma warning (push) -# pragma warning (disable:4309) /* static_cast trunction of constant value */ +# pragma warning (disable:4309) /* static_cast truncation of constant value */ # pragma warning (disable:4310) /* cast truncates constant value */ #endif diff --git a/Utilities/KWIML/test/test_int_format.h b/Utilities/KWIML/test/test_int_format.h index e139bdb..56b022e 100644 --- a/Utilities/KWIML/test/test_int_format.h +++ b/Utilities/KWIML/test/test_int_format.h @@ -8,7 +8,7 @@ #if defined(_MSC_VER) # pragma warning (push) -# pragma warning (disable:4309) /* static_cast trunction of constant value */ +# pragma warning (disable:4309) /* static_cast truncation of constant value */ # pragma warning (disable:4310) /* cast truncates constant value */ #endif |