Merge branch 'hotfix/0.28.1'

* hotfix/0.28.1: Version 0.28.1 Fix ambiguous call to std::min
ecmwf · Mar 14, 2022 · 2575ca3 · 2575ca3
2 parents 3901c05 + ad12f73
commit 2575ca3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## [Unreleased]
 
+## [0.28.1] - 2021-03-14
+### Fixed
+- Fix compilation for GNU 7.3
+
 ## [0.28.0] - 2021-03-02
 ### Added
 - Assignment of ArrayView from ArrayView
@@ -341,6 +345,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ## 0.13.0 - 2018-02-16
 
 [Unreleased]: https://github.com/ecmwf/atlas/compare/master...develop
+[0.28.1]: https://github.com/ecmwf/atlas/compare/0.28.0...0.28.1
 [0.28.0]: https://github.com/ecmwf/atlas/compare/0.27.0...0.28.0
 [0.27.0]: https://github.com/ecmwf/atlas/compare/0.26.0...0.27.0
 [0.26.0]: https://github.com/ecmwf/atlas/compare/0.25.0...0.26.0

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.28.0
+0.28.1
diff --git a/src/atlas/meshgenerator/detail/CubedSphereMeshGenerator.cc b/src/atlas/meshgenerator/detail/CubedSphereMeshGenerator.cc
@@ -676,7 +676,7 @@ void CubedSphereMeshGenerator::generate_mesh(const CubedSphereGrid& csGrid, cons
                             // non-null local cell pointer.
                             if (globalCell.localPtr) {
                                 isGhost = true;
-                                halo    = std::min(halo, globalCell.localPtr->halo);
+                                halo    = std::min<idx_t>(halo, globalCell.localPtr->halo);
                             }
                         }
                     }