From 1940de0110853a028a3570f8424cdb64dad5a934 Mon Sep 17 00:00:00 2001
From: Stephen Williams <steve@icarus.com>
Date: Thu, 25 Jun 2009 20:43:09 -0700
Subject: [PATCH] Fix some merge errors.

---
 vvp/array.cc | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/vvp/array.cc b/vvp/array.cc
index ec3f112f3..839f59eb7 100644
--- a/vvp/array.cc
+++ b/vvp/array.cc
@@ -1163,9 +1163,9 @@ void vvp_fun_arrayport_sa::check_word_change(unsigned long addr)
       if (addr != addr_) return;
 
       if (vpi_array_is_real(arr_)) {
-	    net_->send_real(net_->out, array_get_word_r(arr_, addr_), 0);
+	    net_->send_real(array_get_word_r(arr_, addr_), 0);
       } else {
-	    net_->send_vec4(net_->out, array_get_word(arr_, addr_), 0);
+	    net_->send_vec4(array_get_word(arr_, addr_), 0);
       }
 }
 
@@ -1250,12 +1250,10 @@ void vvp_fun_arrayport_aa::recv_vec4(vvp_net_ptr_t port, const vvp_vector4_t&bit
                   addr_valid_flag = vector4_to_value(bit, *addr);
                   if (! addr_valid_flag) *addr = arr_->array_count;
                   if (vpi_array_is_real(arr_)) {
-			port.ptr()->send_real(port.ptr()->out,
-					      array_get_word_r(arr_, *addr),
+			port.ptr()->send_real(array_get_word_r(arr_, *addr),
 					      context);
                   } else {
-			port.ptr()->send_vec4(port.ptr()->out,
-					      array_get_word(arr_, *addr),
+			port.ptr()->send_vec4(array_get_word(arr_, *addr),
 					      context);
                   }
                   break;
@@ -1282,10 +1280,10 @@ void vvp_fun_arrayport_aa::check_word_change(unsigned long addr)
 	    return;
 
       if (vpi_array_is_real(arr_)) {
-	    net_->send_real(net_->out, array_get_word_r(arr_, addr),
+	    net_->send_real(array_get_word_r(arr_, addr),
 			    vthread_get_wt_context());
       } else {
-	    net_->send_vec4(net_->out, array_get_word(arr_, addr),
+	    net_->send_vec4(array_get_word(arr_, addr),
 	                  vthread_get_wt_context());
       }
 }