Skip to content

Commit 08dce61

Browse files
Copilott-b
andcommitted
Fix variable name conflict in GST_ReturnsCorrectSize
Rename waveType variable to type to avoid conflict with WaveType() function. Co-authored-by: t-b <1185677+t-b@users.noreply.github.com>
1 parent cc52f15 commit 08dce61

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Packages/tests/Basic/UTF_Utils_WaveHandling.ipf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2542,31 +2542,31 @@ End
25422542
Function GST_ReturnsCorrectSize([WAVE wv])
25432543

25442544
variable expectedSize
2545-
variable waveType = WaveType(wv)
2545+
variable type = WaveType(wv)
25462546

25472547
// Text, wave reference, and datafolder reference waves
2548-
if(waveType == 0)
2548+
if(type == 0)
25492549
expectedSize = 8 // pointer size
25502550
// Complex waves
2551-
elseif(waveType & IGOR_TYPE_COMPLEX)
2552-
if(waveType & IGOR_TYPE_32BIT_FLOAT)
2551+
elseif(type & IGOR_TYPE_COMPLEX)
2552+
if(type & IGOR_TYPE_32BIT_FLOAT)
25532553
expectedSize = 8 // single precision complex
25542554
else
25552555
expectedSize = 16 // double precision complex
25562556
endif
25572557
// Floating point waves
2558-
elseif(waveType & IGOR_TYPE_32BIT_FLOAT)
2558+
elseif(type & IGOR_TYPE_32BIT_FLOAT)
25592559
expectedSize = 4
2560-
elseif(waveType & IGOR_TYPE_64BIT_FLOAT)
2560+
elseif(type & IGOR_TYPE_64BIT_FLOAT)
25612561
expectedSize = 8
25622562
// Integer waves
2563-
elseif(waveType & IGOR_TYPE_8BIT_INT)
2563+
elseif(type & IGOR_TYPE_8BIT_INT)
25642564
expectedSize = 1
2565-
elseif(waveType & IGOR_TYPE_16BIT_INT)
2565+
elseif(type & IGOR_TYPE_16BIT_INT)
25662566
expectedSize = 2
2567-
elseif(waveType & IGOR_TYPE_32BIT_INT)
2567+
elseif(type & IGOR_TYPE_32BIT_INT)
25682568
expectedSize = 4
2569-
elseif(waveType & IGOR_TYPE_64BIT_INT)
2569+
elseif(type & IGOR_TYPE_64BIT_INT)
25702570
expectedSize = 8
25712571
else
25722572
FAIL()

0 commit comments

Comments
 (0)