diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 2003-12-11 18:54:57 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 2003-12-11 18:54:57 +0000 |
| commit | 4f2912400995753b183bc40d45efac3e75963d7f (patch) | |
| tree | 35f542091cf246dea79e1581771bae036fe5f93e | |
| parent | 1756758c8c98ba32ded705c7fb37a33744023520 (diff) | |
| download | ATCD-4f2912400995753b183bc40d45efac3e75963d7f.tar.gz | |
Thu Dec 11 13:50:41 2003 Chris Cleeland <cleeland_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6d0ac233f03..5018e282898 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Dec 11 13:50:41 2003 Chris Cleeland <cleeland_c@ociweb.com> + + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp + (handle_input): + + Corrected the class name on handle_input definition. That'll + teach me to blindly use merge tools. + Thu Dec 11 18:13:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * tao/RTScheduling/RTScheduler_include.pidl: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp index 4d8ff500745..84c3e699533 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -549,7 +549,7 @@ TAO_UIPMC_Transport::recv (char *buf, } int -TAO_DIOP_Transport::handle_input (TAO_Resume_Handle &rh, +TAO_UIPMC_Transport::handle_input (TAO_Resume_Handle &rh, ACE_Time_Value *max_wait_time, int /*block*/) { |