summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-11-16 16:18:55 (GMT)
committerBrad King <brad.king@kitware.com>2023-11-16 20:15:51 (GMT)
commitf2cc0ef2ed5e44348f1a417179d7b1eb4a481198 (patch)
treec8fb8657424266a1d81df2946fb4f9875f80e300
parent0b6c6bb1ea67e2f84b6dc06cdad93350b312a0a6 (diff)
parent83dd9be285328b4005db47c861e1818c042dabbb (diff)
downloadCMake-f2cc0ef2ed5e44348f1a417179d7b1eb4a481198.zip
CMake-f2cc0ef2ed5e44348f1a417179d7b1eb4a481198.tar.gz
CMake-f2cc0ef2ed5e44348f1a417179d7b1eb4a481198.tar.bz2
Merge branch 'upstream-KWIML' into update-kwiml
* upstream-KWIML: KWIML 2023-11-16 (500bc253)
-rw-r--r--Utilities/KWIML/include/kwiml/abi.h2
-rw-r--r--Utilities/KWIML/include/kwiml/int.h2
-rw-r--r--Utilities/KWIML/test/test_int_format.h2
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