diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-07-10 17:23:31 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-07-10 17:23:31 +0000 |
| commit | 9161a94923128823dec2609361300544ab6c0830 (patch) | |
| tree | 56acdbd4c969fbfc7cf812753ba093379bb803fc | |
| parent | 374be7ca06ae8da3647da36237bfe62711fa6824 (diff) | |
| download | ATCD-9161a94923128823dec2609361300544ab6c0830.tar.gz | |
ChangeLogTag:Fri Jul 10 12:21:18 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/Makefile | 3 |
4 files changed, 14 insertions, 6 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 44b99091b52..9ed5dda829e 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,10 @@ +Fri Jul 10 12:21:18 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * orbsvcs/tests/EC_Throughput/Makefile: + * orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp: + Fixed errors and warnings reported by David. + Fri Jul 10 00:32:51 1998 Carlos O'Ryan <coryan@cs.wustl.edu> * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp: diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index 6fd9b149610..62b63e35ef1 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -241,14 +241,14 @@ Driver::push_consumer (void* consumer_cookie, // other.description.in (), // other.inventory.current_size ())); - for (CORBA::ULong i = 0; i < n; ++i) + for (CORBA::ULong j = 0; j < n; ++j) { - ECT_IDLData::Point& p = info.trajectory[i]; - if (p.x != i || p.y != i*i) + ECT_IDLData::Point& p = info.trajectory[j]; + if (p.x != j || p.y != j*j) { ACE_DEBUG ((LM_DEBUG, "invalid data in trajectory[%d] = (%f,%f)\n", - i, p.x, p.y)); + j, p.x, p.y)); } } } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index e9b41afef41..944c156054f 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -511,7 +511,7 @@ int Test_Supplier::supplier_id (void) const RtecEventChannelAdmin::ProxyPushConsumer_ptr Test_Supplier::consumer_proxy (void) { - return this->consumer_proxy_; + return this->consumer_proxy_.in (); } // **************************************************************** diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile index c0c00a90b15..8bf361b1a18 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile @@ -51,7 +51,8 @@ ECT_Consumer: $(addprefix $(VDIR),$(ECT_Consumer_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) realclean: - $(RM) dataC.* dataS.* dataS_T.* + $(RM) -f dataC.* dataS.* dataS_T.* + $(RM) -f $(BUILD) #---------------------------------------------------------------------------- # Dependencies |