From 075dd7baa08da2e9de95696d44e90cf97bf94c65 Mon Sep 17 00:00:00 2001
From: Tom Clune <thomas.l.clune@nasa.gov>
Date: Mon, 10 Jan 2022 14:22:58 -0500
Subject: [PATCH] Fixes #153

---
 ChangeLog.MD                   | 14 ++++++++++++++
 include/v2/pair/procedures.inc |  2 +-
 include/v2/ptr/procedures.inc  |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.MD b/ChangeLog.MD
index 85151f6..d6d68e4 100644
--- 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
index 92b71e0..cd4da4d 100644
--- 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
index 4e5179f..c47e68a 100644
--- 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)