Skip to content

Commit 2b7455c

Browse files
committed
Simplify allocation check
1 parent 8bd22f7 commit 2b7455c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

fpm-docs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 2bb2038142e926c55eeea961f55506903c5b6827

src/fpm/manifest/package.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -550,19 +550,19 @@ logical function manifest_is_same(this,that)
550550
if (.not.this%install==other%install) return
551551
if (.not.this%fortran==other%fortran) return
552552
if (allocated(this%license).neqv.allocated(other%license)) return
553-
if (allocated(this%license) .and. allocated(other%license)) then
553+
if (allocated(this%license)) then
554554
if (.not.this%license==other%license) return
555555
end if
556556
if (allocated(this%author).neqv.allocated(other%author)) return
557-
if (allocated(this%author) .and. allocated(other%author)) then
557+
if (allocated(this%author)) then
558558
if (.not.this%author==other%author) return
559559
end if
560560
if (allocated(this%maintainer).neqv.allocated(other%maintainer)) return
561-
if (allocated(this%maintainer) .and. allocated(other%maintainer)) then
561+
if (allocated(this%maintainer)) then
562562
if (.not.this%maintainer==other%maintainer) return
563563
end if
564564
if (allocated(this%copyright).neqv.allocated(other%copyright)) return
565-
if (allocated(this%copyright) .and. allocated(other%copyright)) then
565+
if (allocated(this%copyright)) then
566566
if (.not.this%copyright==other%copyright) return
567567
end if
568568
if (allocated(this%library).neqv.allocated(other%library)) return

0 commit comments

Comments
 (0)