Merge pull request #5041 from Jackie9527/msvc-clang-format-non-iso

Fix warning related to format-non-iso.
2023-04-04 17:01:27 +02:00
parent 414091ab11 17bdd5f9b5
commit 17d8e991cc
2 changed files with 1 additions and 2 deletions
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -1245,7 +1245,6 @@ IF (ASSIMP_WARNINGS_AS_ERRORS)
        -Wno-deprecated-copy-with-dtor
        -Wno-deprecated
        -Wno-format-nonliteral
-        -Wno-format-non-iso
        -Wno-comma
        -Wno-unreachable-code-break
        -Wno-unreachable-code-return
--- a/include/assimp/StringUtils.h
+++ b/include/assimp/StringUtils.h
@@ -56,7 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sstream>
 #include <iomanip>

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #define AI_SIZEFMT "%Iu"
 #else
 #define AI_SIZEFMT "%zu"