[Bf-blender-cvs] [fad8e475c76] functions: remove UNUSED_FUNCTION_NDEBUG macro again
Jacques Lucke
noreply at git.blender.org
Mon Feb 17 10:45:39 CET 2020
Commit: fad8e475c76ceee0dc47ee10ff74a595381afdb9
Author: Jacques Lucke
Date: Sun Feb 16 12:45:25 2020 +0100
Branches: functions
https://developer.blender.org/rBfad8e475c76ceee0dc47ee10ff74a595381afdb9
remove UNUSED_FUNCTION_NDEBUG macro again
===================================================================
M source/blender/blenlib/BLI_utildefines.h
M source/blender/functions/intern/node_tree_multi_function_network/generate.cc
===================================================================
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
index 63a216809a9..5d80da6de77 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -695,12 +695,6 @@ extern bool BLI_memory_is_zero(const void *arr, const size_t arr_size);
# define UNUSED_FUNCTION(x) UNUSED_##x
#endif
-#ifdef DEBUG
-# define UNUSED_FUNCTION_NDEBUG(x) x
-#else
-# define UNUSED_FUNCTION_NDEBUG(x) UNUSED_FUNCTION(x)
-#endif
-
/**
* UNUSED_VARS#(a, ...): quiet unused warnings
*
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/generate.cc b/source/blender/functions/intern/node_tree_multi_function_network/generate.cc
index 02cdcc2efdd..23413bb3516 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/generate.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/generate.cc
@@ -11,10 +11,9 @@
namespace FN {
namespace MFGeneration {
-BLI_NOINLINE static bool UNUSED_FUNCTION_NDEBUG(check_if_data_links_are_valid)(
- const FunctionTree &function_tree,
- const FunctionTreeMFMappings &mappings,
- const FSocketDataTypes &fsocket_data_types)
+BLI_NOINLINE static bool check_if_data_links_are_valid(const FunctionTree &function_tree,
+ const FunctionTreeMFMappings &mappings,
+ const FSocketDataTypes &fsocket_data_types)
{
for (const FInputSocket *to_fsocket : function_tree.all_input_sockets()) {
ArrayRef<const FOutputSocket *> origin_sockets = to_fsocket->linked_sockets();
More information about the Bf-blender-cvs
mailing list