Merge pull request #154 from Goddard-Fortran-Ecosystem/hotfix/#153-pa…

…ir-lt-bug Fixes #153
Goddard-Fortran-Ecosystem · Jan 10, 2022 · 898bfcc · 898bfcc
2 parents 709c211 + 075dd7b
commit 898bfcc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/ChangeLog.MD b/ChangeLog.MD
@@ -1,6 +1,20 @@
 # Change Log
 
 ## Unreleased
+
+## [1.5.4] - 2022-01-10
+
+### Fixed
+
+- Minor bug in Pair template that is exposed under certain combinations
+  of key/value types.   If key has "==" but "value" does not, then some
+  local variable declarations are skipped that are needed.
+
+- Declarion of Ptr argument in Pointer template.   Still not ready 
+  for production use though.
+
+### Changed
+
 - On Windows M4 program is now downloaded from SourceForge during CMake configuration
   if it is not found.
 

diff --git a/include/v2/pair/procedures.inc b/include/v2/pair/procedures.inc
@@ -40,7 +40,7 @@
       type(__pair), target, intent(in) :: a
       type(__pair), target, intent(in) :: b
 
-#if !(defined(__T1_EQ__) | defined(__T2_EQ__))
+#if (!defined(__T1_EQ__) | !defined(__T2_EQ__))
       logical :: lt, gt
 #endif      
 #if defined(__T1_EQ__)

diff --git a/include/v2/ptr/procedures.inc b/include/v2/ptr/procedures.inc
@@ -22,7 +22,7 @@
 #include "parameters/T/define_derived_macros.inc"
 
    function __MANGLE(new_ptr)(trgt) result(p)
-      type (Ptr) :: p
+      type (__ptr) :: p
       __T_declare_component__, target, intent(in) :: trgt
       p%ptr => trgt
    end function __MANGLE(new_ptr)