Commit: d6570fcaede9e1b33e50dfbb8c1b074bd9b660c2
Author: Brecht Van Lommel
Date: Wed Aug 12 12:15:01 2020 +0200
Branches: master
https://developer.blender.org/rBd6570fcaede9e1b33e50dfbb8c1b074bd9b660c2
Cleanup: compiler warnings
===================================================================
M intern/guardedalloc/tests/guardedalloc_overflow_test.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
===================================================================
diff --git a/intern/guardedalloc/tests/guardedalloc_overflow_test.cc
b/intern/guardedalloc/tests/guardedalloc_overflow_test.cc
index eb9a2a68cb0..e5754bc95ea 100644
--- a/intern/guardedalloc/tests/guardedalloc_overflow_test.cc
+++ b/intern/guardedalloc/tests/guardedalloc_overflow_test.cc
@@ -11,7 +11,7 @@
# define ABORT_PREDICATE ::testing::KilledBySignal(SIGABRT)
#endif
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__clang__)
/* Disable since it's the purpose of this test. */
# pragma GCC diagnostic ignored "-Walloc-size-larger-than="
#endif
diff --git
a/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
b/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
index b853ecd8e56..cab20dadc50 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
@@ -127,7 +127,7 @@ Relation
*DepsgraphRelationBuilder::add_node_handle_relation(const KeyType &key_
return nullptr;
}
-static bool rigidbody_object_depends_on_evaluated_geometry(const RigidBodyOb
*rbo)
+static inline bool rigidbody_object_depends_on_evaluated_geometry(const
RigidBodyOb *rbo)
{
if (rbo == nullptr) {
return false;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
