diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2005-04-14 15:56:31 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2005-04-14 15:56:31 +0000 |
| commit | bdca2dbbf5a62ece9014c128a1295466aa70f8ed (patch) | |
| tree | 1ca3b3536201381c2b0ee63ef03083002c2091ee | |
| parent | a323238e8f76a9b4481d492cc5c8b1486d3efb9f (diff) | |
| download | ATCD-bdca2dbbf5a62ece9014c128a1295466aa70f8ed.tar.gz | |
Thu Apr 14 10:54:56 CDT 2005 Will Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index f54ac927224..aabf97f9adc 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,4 +1,9 @@ +Thu Apr 14 10:54:56 CDT 2005 Will Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp + Fixed a warning due to ambiguous conversion. + Thu Apr 143 10:21:58 2005 Gan Deng <dengg@dre.vanderbilt.edu> * DAnCE/examples/Hello/Sender/Sender.idl diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp index e0d92b19044..27e60b64a19 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp @@ -223,7 +223,7 @@ namespace CIAO Dynamic_Component_Servant_Base *svt = new Dynamic_Component_Servant <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, EXEC, EXEC_VAR, COMP> - (ec, home, this, this->container_); + (ec, home.in (), this, this->container_); this->container_->add_servant_map (oid, svt ACE_ENV_ARG_PARAMETER); |