diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-11-14 11:04:42 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-11-14 11:04:42 +0000 |
| commit | 2e65dd55991cc29429640ebbd507866b25a28954 (patch) | |
| tree | 2c10d5f79dcbd87fbc295a8bc651a0e7987f6559 | |
| parent | 61721511c58c887f076adc3715aac979a4b92d43 (diff) | |
| download | ATCD-2e65dd55991cc29429640ebbd507866b25a28954.tar.gz | |
ChangeLogTag: Mon Nov 14 10:01:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/CIAO/ciao/Servant_Activator.cpp | 16 | ||||
| -rw-r--r-- | TAO/CIAO/examples/BasicSP/EC/EC_exec.h | 2 | ||||
| -rw-r--r-- | TAO/CIAO/examples/Display/RateGen/RateGen_exec.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/TAO/CIAO/ciao/Servant_Activator.cpp b/TAO/CIAO/ciao/Servant_Activator.cpp index 93a88228c0f..6830454ac35 100644 --- a/TAO/CIAO/ciao/Servant_Activator.cpp +++ b/TAO/CIAO/ciao/Servant_Activator.cpp @@ -25,9 +25,9 @@ namespace CIAO guard, this->mutex_); - const unsigned int sz = this->slot_index_; + const size_t sz = this->slot_index_; - for (unsigned int t = 0; t != sz; ++t) + for (size_t t = 0; t != sz; ++t) { Port_Activator *&tmp = this->pa_[t]; @@ -49,8 +49,8 @@ namespace CIAO guard, this->mutex_, 0); - const unsigned int sz = this->slot_index_; - for (unsigned int t = 0; t != sz; ++t) + const size_t sz = this->slot_index_; + for (size_t t = 0; t != sz; ++t) { Port_Activator *&tmp = this->pa_[t]; if (ACE_OS::strcmp (tmp->name (), str.in ()) == 0) @@ -86,11 +86,11 @@ namespace CIAO this->mutex_, 0); - const unsigned int sz = this->slot_index_; + const size_t sz = this->slot_index_; Port_Activator *tmp = 0; - for (unsigned int t = 0; t != sz; ++t) + for (size_t t = 0; t != sz; ++t) { if (this->pa_.get (tmp, t) == -1) ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), @@ -133,11 +133,11 @@ namespace CIAO CORBA::String_var str = PortableServer::ObjectId_to_string (oid); - const unsigned int sz = this->slot_index_; + const size_t sz = this->slot_index_; Port_Activator *tmp = 0; - for (unsigned int t = 0; t != sz; ++t) + for (size_t t = 0; t != sz; ++t) { if (this->pa_.get (tmp, t) == -1) { diff --git a/TAO/CIAO/examples/BasicSP/EC/EC_exec.h b/TAO/CIAO/examples/BasicSP/EC/EC_exec.h index 057f8f70f14..db95a5deaa4 100644 --- a/TAO/CIAO/examples/BasicSP/EC/EC_exec.h +++ b/TAO/CIAO/examples/BasicSP/EC/EC_exec.h @@ -62,7 +62,7 @@ namespace MyImpl int done_; /// The timer id we are waiting. - int tid_; + long tid_; EC_exec_i *pulse_callback_; diff --git a/TAO/CIAO/examples/Display/RateGen/RateGen_exec.h b/TAO/CIAO/examples/Display/RateGen/RateGen_exec.h index 8122b1cceda..b6b8031c3bf 100644 --- a/TAO/CIAO/examples/Display/RateGen/RateGen_exec.h +++ b/TAO/CIAO/examples/Display/RateGen/RateGen_exec.h @@ -61,7 +61,7 @@ namespace MyImpl int done_; /// The timer id we are waiting. - int tid_; + long tid_; RateGen_exec_i *pulse_callback_; |