From 7a184d00dd88b98e6f057f96abac875a49cde437 Mon Sep 17 00:00:00 2001
From: Matt Liberty <mliberty@precisioninno.com>
Date: Tue, 12 Dec 2023 16:27:37 -0800
Subject: [PATCH] fix merge

Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
---
 liberty/TableModel.cc | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/liberty/TableModel.cc b/liberty/TableModel.cc
index fb11e855..42e30724 100644
--- a/liberty/TableModel.cc
+++ b/liberty/TableModel.cc
@@ -225,24 +225,24 @@ GateTableModel::findAxisValues(const TableModel *model,
     axis_value3 = 0.0;
     break;
   case 1:
-    axis_value1 = axisValue(model->readonly_axis1(), in_slew, load_cap,
+    axis_value1 = axisValue(model->axis1(), in_slew, load_cap,
 			    related_out_cap);
     axis_value2 = 0.0;
     axis_value3 = 0.0;
     break;
   case 2:
-    axis_value1 = axisValue(model->readonly_axis1(), in_slew, load_cap,
+    axis_value1 = axisValue(model->axis1(), in_slew, load_cap,
 			    related_out_cap);
-    axis_value2 = axisValue(model->readonly_axis2(), in_slew, load_cap,
+    axis_value2 = axisValue(model->axis2(), in_slew, load_cap,
 			    related_out_cap);
     axis_value3 = 0.0;
     break;
   case 3:
-    axis_value1 = axisValue(model->readonly_axis1(), in_slew, load_cap,
+    axis_value1 = axisValue(model->axis1(), in_slew, load_cap,
 			    related_out_cap);
-    axis_value2 = axisValue(model->readonly_axis2(), in_slew, load_cap,
+    axis_value2 = axisValue(model->axis2(), in_slew, load_cap,
 			    related_out_cap);
-    axis_value3 = axisValue(model->readonly_axis3(), in_slew, load_cap,
+    axis_value3 = axisValue(model->axis3(), in_slew, load_cap,
 			    related_out_cap);
     break;
   default:
@@ -633,24 +633,6 @@ TableModel::axis3() const
   return table_->axis3();
 }
 
-const TableAxisPtr& 
-TableModel::readonly_axis1() const
-{
-  return table_->readonly_axis1();
-}
-
-const TableAxisPtr& 
-TableModel::readonly_axis2() const
-{
-  return table_->readonly_axis2();
-}
-
-const TableAxisPtr& 
-TableModel::readonly_axis3() const
-{
-  return table_->readonly_axis3();
-}
-
 float
 TableModel::value(size_t axis_index1,
                   size_t axis_index2,
@@ -1626,9 +1608,9 @@ OutputWaveforms::~OutputWaveforms()
 bool
 OutputWaveforms::checkAxes(TableTemplate *tbl_template)
 {
-  const TableAxisPtr& axis1 = tbl_template->readonly_axis1();
-  const TableAxisPtr& axis2 = tbl_template->readonly_axis2();
-  const TableAxisPtr& axis3 = tbl_template->readonly_axis3();
+  TableAxisPtr axis1 = tbl_template->axis1();
+  TableAxisPtr axis2 = tbl_template->axis2();
+  TableAxisPtr axis3 = tbl_template->axis3();
   return (axis1 && axis1->variable() == TableAxisVariable::input_net_transition
           && axis2->variable() == TableAxisVariable::time
           && axis3 == nullptr)