Skip to content

Commit f018414

Browse files
authored
Replace merge(n, 0, n > 0) by max(n, 0)
1 parent 6364bc2 commit f018414

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/stdlib_math.fypp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ module stdlib_math
5050
${t1}$, intent(in) :: end
5151
integer, intent(in) :: n
5252

53-
${t1}$ :: res(merge(n, 0, n > 0))
53+
${t1}$ :: res(max(n, 0))
5454
end function ${RName}$
5555
#:endfor
5656

@@ -77,7 +77,7 @@ module stdlib_math
7777
${t1}$, intent(in) :: end
7878
integer, intent(in) :: n
7979

80-
real(dp) :: res(merge(n, 0, n > 0))
80+
real(dp) :: res(max(n, 0))
8181
end function ${RName}$
8282
#:endfor
8383

@@ -127,7 +127,7 @@ module stdlib_math
127127
${t1}$, intent(in) :: end
128128
integer, intent(in) :: n
129129

130-
${t1}$ :: res(merge(n, 0, n > 0))
130+
${t1}$ :: res(max(n, 0))
131131
end function ${RName}$
132132
#:endfor
133133
#! Integer support
@@ -159,7 +159,7 @@ module stdlib_math
159159
integer, intent(in) :: n
160160
${t1}$, intent(in) :: base
161161
! real(${k1}$) endpoints + real(${k1}$) base = real(${k1}$) result
162-
${t1}$ :: res(merge(n, 0, n > 0))
162+
${t1}$ :: res(max(n, 0))
163163
end function ${RName}$
164164

165165
#:set RName = rname("logspace", 1, t1, k1, "n_cbase")
@@ -169,7 +169,7 @@ module stdlib_math
169169
integer, intent(in) :: n
170170
complex(${k1}$), intent(in) :: base
171171
! real(${k1}$) endpoints + complex(${k1}$) base = complex(${k1}$) result
172-
${t1}$ :: res(merge(n, 0, n > 0))
172+
${t1}$ :: res(max(n, 0))
173173
end function ${RName}$
174174

175175
#:set RName = rname("logspace", 1, t1, k1, "n_ibase")
@@ -179,7 +179,7 @@ module stdlib_math
179179
integer, intent(in) :: n
180180
integer, intent(in) :: base
181181
! real(${k1}$) endpoints + integer base = real(${k1}$) result
182-
${t1}$ :: res(merge(n, 0, n > 0))
182+
${t1}$ :: res(max(n, 0))
183183
end function ${RName}$
184184
#:endfor
185185
#! ========================================================
@@ -196,7 +196,7 @@ module stdlib_math
196196
integer, intent(in) :: n
197197
real(${k1}$), intent(in) :: base
198198
! complex(${k1}$) endpoints + real(${k1}$) base = complex(${k1}$) result
199-
${t1}$ :: res(merge(n, 0, n > 0))
199+
${t1}$ :: res(max(n, 0))
200200
end function ${RName}$
201201

202202
#:set RName = rname("logspace", 1, t1, k1, "n_cbase")
@@ -206,7 +206,7 @@ module stdlib_math
206206
integer, intent(in) :: n
207207
complex(${k1}$), intent(in) :: base
208208
! complex(${k1}$) endpoints + complex(${k1}$) base = complex(${k1}$) result
209-
${t1}$ :: res(merge(n, 0, n > 0))
209+
${t1}$ :: res(max(n, 0))
210210
end function ${RName}$
211211

212212
#:set RName = rname("logspace", 1, t1, k1, "n_ibase")
@@ -216,7 +216,7 @@ module stdlib_math
216216
integer, intent(in) :: n
217217
integer, intent(in) :: base
218218
! complex(${k1}$) endpoints + integer base = complex(${k1}$) result
219-
${t1}$ :: res(merge(n, 0, n > 0))
219+
${t1}$ :: res(max(n, 0))
220220
end function ${RName}$
221221
#:endfor
222222
#! ========================================================
@@ -234,7 +234,7 @@ module stdlib_math
234234
integer, intent(in) :: n
235235
real(${k1}$), intent(in) :: base
236236
! integer endpoints + real(${k1}$) base = real(${k1}$) result
237-
real(${k1}$) :: res(merge(n, 0, n > 0))
237+
real(${k1}$) :: res(max(n, 0))
238238
end function ${RName}$
239239

240240
#:set RName = rname("logspace", 1, "integer(int32)", "int32", "n_c" + str(k1) + "base")
@@ -244,7 +244,7 @@ module stdlib_math
244244
integer, intent(in) :: n
245245
complex(${k1}$), intent(in) :: base
246246
! integer endpoints + complex(${k1}$) base = complex(${k1}$) result
247-
complex(${k1}$) :: res(merge(n, 0, n > 0))
247+
complex(${k1}$) :: res(max(n, 0))
248248
end function ${RName}$
249249
#:endfor
250250

@@ -255,7 +255,7 @@ module stdlib_math
255255
integer, intent(in) :: n
256256
integer, intent(in) :: base
257257
! integer endpoints + integer base = integer result
258-
integer :: res(merge(n, 0, n > 0))
258+
integer :: res(max(n, 0))
259259
end function ${RName}$
260260

261261

0 commit comments

Comments
 (0)