Skip to content

Commit

Permalink
Merge pull request #65 from Goddard-Fortran-Ecosystem/feature/nvfortr…
Browse files Browse the repository at this point in the history
…an-name-collision-workaround

Workaround for NVIDIA
  • Loading branch information
tclune authored Feb 7, 2023
2 parents 47b7178 + 22d5dce commit f608019
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ jobs:
compiler: gfortran-9
- os: macos-12
compiler: gfortran-10
- os: macos-12
compiler: gfortran-12

# fail-fast if set to 'true' here is good for production, but when
# debugging, set to 'false'. fail-fast means if *any* ci test in the matrix fails
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.12)

project (YAFYAML
VERSION 1.0.6
VERSION 1.0.7
LANGUAGES Fortran)

# Most users of this software do not (should not?) have permissions to
Expand Down
10 changes: 10 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.0.7] - 2023-02-07

### Fixed

- Workaround for NVIDIA compiler

### Added

- Added gfortran-12 test for macos-12

## [1.0.6] - 2023-01-26

### Fixed
Expand Down
6 changes: 3 additions & 3 deletions src/Nodes/SequenceNode.F90
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module fy_SequenceNode
procedure :: equal_to
procedure :: not_equal_to

procedure :: at
procedure :: at => at_SequenceNode
procedure :: first
procedure :: second => first

Expand All @@ -79,13 +79,13 @@ end function less_than

interface

module function at(this, unusable, err_msg, rc) result(ptr)
module function at_SequenceNode(this, unusable, err_msg, rc) result(ptr)
class(YAML_Node), pointer :: ptr
class(SequenceNodeIterator), intent(in) :: this
class(KeywordEnforcer), optional, intent(in) :: unusable
STRING_DUMMY, optional, intent(inout) :: err_msg
integer, optional, intent(out) :: rc
end function at
end function at_SequenceNode

recursive module subroutine clone_sequence(to, from)
type(sequence), target, intent(out) :: to
Expand Down
4 changes: 2 additions & 2 deletions src/Nodes/SequenceNode_implementation.F90
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ recursive module subroutine clone_sequence(to, from)
depth = depth - 1
end subroutine clone_sequence

module function at(this, unusable, err_msg, rc) result(ptr)
module function at_SequenceNode(this, unusable, err_msg, rc) result(ptr)
use fy_keywordenforcer, only: KE => KeywordEnforcer
class(YAML_Node), pointer :: ptr
class(SequenceNodeIterator), intent(in) :: this
Expand All @@ -89,7 +89,7 @@ module function at(this, unusable, err_msg, rc) result(ptr)

ptr => this%seq_iter%of()
__RETURN__(YAFYAML_SUCCESS)
end function at
end function at_SequenceNode


end submodule SequenceNode_implementation
Expand Down

0 comments on commit f608019

Please sign in to comment.