diff options
| author | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-10-22 12:52:42 +0000 |
|---|---|---|
| committer | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-10-22 12:52:42 +0000 |
| commit | 185bba2b43c9ad07f3e069aaba9a1b3044cd7d97 (patch) | |
| tree | 9b140aa6f7a000fdb9a7f109d2409c28aeb363fd | |
| parent | c99e202b98a1352e036841128d3a73f88453bc18 (diff) | |
| download | ATCD-185bba2b43c9ad07f3e069aaba9a1b3044cd7d97.tar.gz | |
ChangeLogTag: Wed Oct 22 12:49:03 UTC 2008 Vladimir Zykov <vzykov@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 967fedc5acb..94f98098421 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Oct 22 12:49:03 UTC 2008 Vladimir Zykov <vzykov@prismtech.com> + + * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: + + %C can only be used in ACE_ERROR/ACE_DEBUG, not sprintf. + I fixed that. + Wed Oct 22 12:01:09 UTC 2008 Vladimir Zykov <vzykov@prismtech.com> * utils/nslist/nsdel.cpp: diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index f4088fc5bde..ce33914cfba 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -625,7 +625,7 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec) mc = 1; char buf[BUFSIZ]; - ACE_OS::sprintf (buf, "hp_supplier_%02d@%C", i, this->lcl_name_.c_str ()); + ACE_OS::sprintf (buf, "hp_supplier_%02d@%s", i, this->lcl_name_.c_str ()); ACE_NEW (this->suppliers_[i], Test_Supplier (this, this->suppliers_ + i)); @@ -646,7 +646,7 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec) mc = 1; char buf[BUFSIZ]; - ACE_OS::sprintf (buf, "lp_supplier_%02d@%C", + ACE_OS::sprintf (buf, "lp_supplier_%02d@%s", i - this->hp_suppliers_, this->lcl_name_.c_str ()); ACE_NEW (this->suppliers_[i], @@ -684,7 +684,7 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec) mc = 1; char buf[BUFSIZ]; - ACE_OS::sprintf (buf, "hp_supplier_%02d@%C", i, this->lcl_name_.c_str ()); + ACE_OS::sprintf (buf, "hp_supplier_%02d@%s", i, this->lcl_name_.c_str ()); this->suppliers_[i]->activate (buf, this->hp_interval_ * 10, @@ -699,7 +699,7 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec) mc = 1; char buf[BUFSIZ]; - ACE_OS::sprintf (buf, "lp_supplier_%02d@%C", + ACE_OS::sprintf (buf, "lp_supplier_%02d@%s", i - this->hp_suppliers_, this->lcl_name_.c_str ()); this->suppliers_[i]->activate (buf, @@ -720,7 +720,7 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec) for (i = 0; i < this->hp_consumers_; ++i) { char buf[BUFSIZ]; - ACE_OS::sprintf (buf, "hp_consumer_%02d@%C", i, this->lcl_name_.c_str ()); + ACE_OS::sprintf (buf, "hp_consumer_%02d@%s", i, this->lcl_name_.c_str ()); ACE_NEW (this->consumers_[i], Test_Consumer (this, this->consumers_ + i)); @@ -737,7 +737,7 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec) for (; i < this->hp_consumers_ + this->lp_consumers_; ++i) { char buf[BUFSIZ]; - ACE_OS::sprintf (buf, "lp_consumer_%02d@%C", + ACE_OS::sprintf (buf, "lp_consumer_%02d@%s", i - this->hp_consumers_, this->lcl_name_.c_str ()); ACE_NEW (this->consumers_[i], |