From 25ad1c174a2926b59ff94c2fbf78902a77c5418e Mon Sep 17 00:00:00 2001
From: Larry Doolittle <ldoolitt@recycle.lbl.gov>
Date: Fri, 4 Jan 2008 11:46:25 -0800
Subject: [PATCH] Clean up compiler warnings

stupid changes to shut up the compiler
tested with gcc-4.2.2
---
 PWire.cc       | 5 +++--
 elab_net.cc    | 2 +-
 vpi/vcd_priv.c | 2 +-
 vvp/array.cc   | 2 +-
 vvp/delay.cc   | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/PWire.cc b/PWire.cc
index 1b375ddc3..404e12ef7 100644
--- a/PWire.cc
+++ b/PWire.cc
@@ -27,8 +27,9 @@ PWire::PWire(const pform_name_t&n,
 	     NetNet::PortType pt,
 	     ivl_variable_type_t dt)
 : hname_(n), type_(t), port_type_(pt), data_type_(dt),
-  signed_(false), isint_(false), port_set_(false), net_set_(false),
-  port_msb_(0), port_lsb_(0), net_msb_(0), net_lsb_(0), error_cnt_(0),
+  signed_(false), isint_(false),
+  port_msb_(0), port_lsb_(0), port_set_(false),
+  net_msb_(0), net_lsb_(0), net_set_(false), error_cnt_(0),
   lidx_(0), ridx_(0)
 {
       if (t == NetNet::INTEGER) {
diff --git a/elab_net.cc b/elab_net.cc
index d1a62a52f..1c0eb7d4c 100644
--- a/elab_net.cc
+++ b/elab_net.cc
@@ -2274,7 +2274,7 @@ bool PEIdent::eval_part_select_(Design*des, NetScope*scope, NetNet*sig,
 	  case index_component_t::SEL_PART: {
 
 		long msb, lsb;
-		bool flag = calculate_parts_(des, scope, msb, lsb);
+		/* bool flag = */ calculate_parts_(des, scope, msb, lsb);
 
 		lidx = sig->sb_to_idx(lsb);
 		midx = sig->sb_to_idx(msb);
diff --git a/vpi/vcd_priv.c b/vpi/vcd_priv.c
index a8462df34..2eef7903f 100644
--- a/vpi/vcd_priv.c
+++ b/vpi/vcd_priv.c
@@ -382,7 +382,7 @@ PLI_INT32 sys_dumpvars_compiletf(PLI_BYTE8 *name)
                                         " numeric.\n", name);
 
       /* The rest of the arguments are either a module or a variable. */
-      while (arg = vpi_scan(argv)) {
+      while ((arg=vpi_scan(argv)) != NULL) {
         switch(vpi_get(vpiType, arg)) {
           /* The module types. */
           case vpiModule:
diff --git a/vvp/array.cc b/vvp/array.cc
index b984b238a..09b689ded 100644
--- a/vvp/array.cc
+++ b/vvp/array.cc
@@ -414,7 +414,7 @@ void compile_real_array(char*label, char*name, int last, int first,
 
 void compile_net_array(char*label, char*name, int last, int first)
 {
-      vpiHandle obj = common_array_build(label, name, last, first);
+      /* vpiHandle obj = */ common_array_build(label, name, last, first);
 
       free(label);
       free(name);
diff --git a/vvp/delay.cc b/vvp/delay.cc
index 151da558b..34e45bb81 100644
--- a/vvp/delay.cc
+++ b/vvp/delay.cc
@@ -653,7 +653,7 @@ static void modpath_src_get_delays ( vpiHandle ref, p_vpi_delay delays )
 			vpip_time_to_timestruct(delays->da+idx, tmp[idx]);
 		  }
 	    } else {
-		  int units = src->dest->scope->time_units;
+		  /* int units = src->dest->scope->time_units; */
 		  for (idx = 0; idx < 12; idx += 1) {
 			delays->da[idx].real = vpip_time_to_scaled_real(tmp[idx], src->dest->scope);
 		  }