From d8450cf1d46b2b66b1d751ac614534ab559bc02b Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Wed, 12 May 2021 22:49:25 -0400
Subject: [PATCH] Corrected an issue with a conflict between the "gds ordering"
 and "gds noduplicates" options (essentially, they were canceling each other
 out).

---
 VERSION           | 2 +-
 calma/CalmaRdcl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index c0947289..e536aa0f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.161
+8.3.162
diff --git a/calma/CalmaRdcl.c b/calma/CalmaRdcl.c
index 1581c8c3..71be0d79 100644
--- a/calma/CalmaRdcl.c
+++ b/calma/CalmaRdcl.c
@@ -352,6 +352,7 @@ calmaParseStructure(filename)
     }
     if (CalmaUnique) calmaUniqueCell(strname);	/* Ensure uniqueness */
     cifReadCellDef = calmaFindCell(strname, &was_called, &predefined);
+    HashSetValue(he, cifReadCellDef);
 
     if (predefined == TRUE)
     {
@@ -374,7 +375,6 @@ calmaParseStructure(filename)
     {
 	DBCellClearDef(cifReadCellDef);
 	DBCellSetAvail(cifReadCellDef);
-	HashSetValue(he, cifReadCellDef);
 	cifCurReadPlanes = cifSubcellPlanes;
 	cifReadCellDef->cd_flags &= ~CDDEREFERENCE;