From 4a6d3a51045b1b33e6cf5d165a7c26db5fd5a710 Mon Sep 17 00:00:00 2001 From: steve Date: Thu, 9 Dec 1999 06:00:00 +0000 Subject: [PATCH] Fix const/non-const errors. --- netlist.h | 6 +++++- vvm/vvm.h | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/netlist.h b/netlist.h index 91117cc20..e6002ce39 100644 --- a/netlist.h +++ b/netlist.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: netlist.h,v 1.99 1999/12/05 19:30:43 steve Exp $" +#ident "$Id: netlist.h,v 1.100 1999/12/09 06:00:00 steve Exp $" #endif /* @@ -973,6 +973,7 @@ class NetAssignMem_ : public NetProc { NetMemory*memory() { return mem_; } NetNet*index() { return index_; } + NetExpr*rval() { return rval_; } const NetMemory*memory()const { return mem_; } const NetNet*index()const { return index_; } @@ -2066,6 +2067,9 @@ extern ostream& operator << (ostream&, NetNet::Type); /* * $Log: netlist.h,v $ + * Revision 1.100 1999/12/09 06:00:00 steve + * Fix const/non-const errors. + * * Revision 1.99 1999/12/05 19:30:43 steve * Generate XNF RAMS from synthesized memories. * diff --git a/vvm/vvm.h b/vvm/vvm.h index 4dae229d0..4b9f25c25 100644 --- a/vvm/vvm.h +++ b/vvm/vvm.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: vvm.h,v 1.25 1999/12/05 02:24:09 steve Exp $" +#ident "$Id: vvm.h,v 1.26 1999/12/09 06:00:19 steve Exp $" #endif # include @@ -138,7 +138,9 @@ template class vvm_bitset_t : public vvm_bits_t { vvm_bitset_t(const vvm_bitset_t&that) - { bits = that.bits; } + { for (unsigned idx = 0; idx < WIDTH; idx += 1) + bits[idx] = that.bits[idx]; + } vpip_bit_t operator[] (unsigned idx) const { return bits[idx]; } vpip_bit_t&operator[] (unsigned idx) { return bits[idx]; } @@ -302,6 +304,9 @@ class vvm_memory_t : public __vpiMemory { /* * $Log: vvm.h,v $ + * Revision 1.26 1999/12/09 06:00:19 steve + * Fix const/non-const errors. + * * Revision 1.25 1999/12/05 02:24:09 steve * Synthesize LPM_RAM_DQ for writes into memories. *