[Bf-blender-cvs] [60614e6b9f5] temp-vse-transform-overwrite: Fix iterator macro shadowing previos declaration

[Richard Antalik]

Commit: 60614e6b9f5904e767a20476d3c0ab96c8c6ed3d
Author: Richard Antalik
Date:   Tue Aug 10 03:45:52 2021 +0200
Branches: temp-vse-transform-overwrite
https://developer.blender.org/rB60614e6b9f5904e767a20476d3c0ab96c8c6ed3d

Fix iterator macro shadowing previos declaration

===================================================================

M	source/blender/sequencer/SEQ_iterator.h

===================================================================

diff --git a/source/blender/sequencer/SEQ_iterator.h b/source/blender/sequencer/SEQ_iterator.h
index 59129ec9da6..faab7a075f4 100644
--- a/source/blender/sequencer/SEQ_iterator.h
+++ b/source/blender/sequencer/SEQ_iterator.h
@@ -34,10 +34,12 @@ struct GSet;
 struct GSetIterator;
 struct Sequence;
 
-#define SEQ_ITERATOR_FOREACH(var, collection) \
-  for (SeqIterator iter = {{{NULL}}}; \
-       SEQ_iterator_ensure(collection, &iter, &var) && var != NULL; \
-       var = SEQ_iterator_yield(&iter))
+#define SEQ_ITERATOR_FOREACH_IMPL(var, collection, suffix) \
+  for (SeqIterator iter##suffix = {{{NULL}}}; \
+       SEQ_iterator_ensure(collection, &iter##suffix, &var) && var != NULL; \
+       var = SEQ_iterator_yield(&iter##suffix))
+
+#define SEQ_ITERATOR_FOREACH(var, collection) SEQ_ITERATOR_FOREACH_IMPL(var, collection, __LINE__)
 
 #define SEQ_ALL_BEGIN(ed, var) \
   { \