summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-02-03 23:34:24 +0000
committercrodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-02-03 23:34:24 +0000
commit9e9b74c383ecb2df8d52d4bcc0407a0da31d2b3d (patch)
tree3ca31a0ef65c22383ffedf12c2890c14c152d161
parent0670ac18655e9ecbf32fdccb7035530f54ae43cf (diff)
downloadATCD-9e9b74c383ecb2df8d52d4bcc0407a0da31d2b3d.tar.gz
ChangeLogTag: Sun Feb 3 18:32:29 2002 Craig Rodrigues <crodrigu@bbn.com>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-02a6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--tests/TP_Reactor_Test.cpp14
4 files changed, 24 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b81a6d0d8e..185928204ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 3 18:32:29 2002 Craig Rodrigues <crodrigu@bbn.com>
+
+ * tests/TP_Reactor_Test.cpp: Use size_t instead of long
+ and int for index_ and sessions_ in order to eliminate
+ more compiler warnings.
+
Sun Feb 3 09:20:04 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
* tests/TP_Reactor_Test.cpp: Fixed a bunch of warnings. Thanks
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 0b81a6d0d8e..185928204ae 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Sun Feb 3 18:32:29 2002 Craig Rodrigues <crodrigu@bbn.com>
+
+ * tests/TP_Reactor_Test.cpp: Use size_t instead of long
+ and int for index_ and sessions_ in order to eliminate
+ more compiler warnings.
+
Sun Feb 3 09:20:04 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
* tests/TP_Reactor_Test.cpp: Fixed a bunch of warnings. Thanks
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 0b81a6d0d8e..185928204ae 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Sun Feb 3 18:32:29 2002 Craig Rodrigues <crodrigu@bbn.com>
+
+ * tests/TP_Reactor_Test.cpp: Use size_t instead of long
+ and int for index_ and sessions_ in order to eliminate
+ more compiler warnings.
+
Sun Feb 3 09:20:04 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
* tests/TP_Reactor_Test.cpp: Fixed a bunch of warnings. Thanks
diff --git a/tests/TP_Reactor_Test.cpp b/tests/TP_Reactor_Test.cpp
index 6291867b905..be4248901c2 100644
--- a/tests/TP_Reactor_Test.cpp
+++ b/tests/TP_Reactor_Test.cpp
@@ -329,8 +329,7 @@ Acceptor::on_delete_receiver (Receiver &rcvr)
ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_);
this->sessions_--;
- if (rcvr.index_ >= 0
- && rcvr.index_ < MAX_RECEIVERS
+ if (rcvr.index_ < MAX_RECEIVERS
&& this->list_receivers_[rcvr.index_] == &rcvr)
this->list_receivers_[rcvr.index_] = 0;
@@ -390,7 +389,7 @@ Receiver::~Receiver (void)
if (acceptor_ != 0)
acceptor_->on_delete_receiver (*this);
- this->index_ = -1;
+ this->index_ = 0;
for (; ;)
{
@@ -628,7 +627,7 @@ private:
int check_destroy (void);
Connector * connector_;
- int index_;
+ size_t index_;
int flg_mask_;
ACE_Recursive_Thread_Mutex mutex_;
@@ -656,7 +655,7 @@ public:
private:
ACE_Recursive_Thread_Mutex mutex_;
- long sessions_;
+ size_t sessions_;
Sender * list_senders_ [MAX_SENDERS];
void on_new_sender (Sender & sndr);
@@ -714,8 +713,7 @@ Connector::on_delete_sender (Sender & sndr)
ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_);
this->sessions_--;
- if (sndr.index_ >= 0
- && sndr.index_ < MAX_SENDERS
+ if (sndr.index_ < MAX_SENDERS
&& this->list_senders_[sndr.index_] == &sndr)
this->list_senders_[sndr.index_] = 0;
@@ -795,7 +793,7 @@ Sender::~Sender (void)
if (connector_ != 0)
connector_->on_delete_sender (*this);
- this->index_ = -1;
+ this->index_ = 0;
for (; ;)
{