[Bf-blender-cvs] [ad77b52abcb] master: Correction to previous Clang strict warning commit
Sergey Sharybin
noreply at git.blender.org
Thu Feb 10 16:06:01 CET 2022
Commit: ad77b52abcbd0daf0d1a3ad395983cb90beeb72a
Author: Sergey Sharybin
Date: Thu Feb 10 16:05:11 2022 +0100
Branches: master
https://developer.blender.org/rBad77b52abcbd0daf0d1a3ad395983cb90beeb72a
Correction to previous Clang strict warning commit
Need to only pop diagnostic if it was really pushed.
Pointed out by Aras Pranckevicius, thanks!
===================================================================
M source/blender/io/wavefront_obj/exporter/obj_export_io.hh
===================================================================
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_io.hh b/source/blender/io/wavefront_obj/exporter/obj_export_io.hh
index 7e5fe1ca526..1745169ff98 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_io.hh
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_io.hh
@@ -273,7 +273,7 @@ constexpr FormattingSyntax syntax_elem_to_formatting(const eMTLSyntaxElement key
}
}
}
-#if defined __GNUC__
+#if defined(__GNUC__) && !defined(__clang__)
# pragma GCC diagnostic pop
#endif
More information about the Bf-blender-cvs
mailing list