diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-03-15 23:51:54 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-03-15 23:51:54 +0000 |
| commit | ce2a9d541a05f779b20f7c3b4cc30c26885fc15b (patch) | |
| tree | bcf536625392ff504b672c832a905c80aaace54c | |
| parent | a200f5e550d0a425c51f64b3ce076d70b9e93524 (diff) | |
| download | ATCD-ce2a9d541a05f779b20f7c3b4cc30c26885fc15b.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.cpp | 2 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.h | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.cpp index ad9dc013752..631927a98c7 100644 --- a/TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.cpp @@ -16,7 +16,7 @@ namespace CIAO Components::CCMHome_ptr home, Session_Container *c, SVNT *sv) - : Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR> (home, c, sv), + : session_context (home, c, sv), servant_ (sv) { } diff --git a/TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.h index b67aadab480..8915d77415b 100644 --- a/TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.h +++ b/TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.h @@ -17,7 +17,6 @@ #include "UpgradeableContextC.h" #include "Context_Impl_T.h" -#include "tao/LocalObject.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,10 +33,8 @@ namespace CIAO typename SVNT, typename COMP, typename COMP_VAR> - class Upgradeable_Context_Impl : public virtual BASE_CTX, - public virtual Context_Impl< - BASE_CTX, SVNT, COMP, COMP_VAR>, - public virtual TAO_Local_RefCounted_Object + class Upgradeable_Context_Impl : public virtual Context_Impl< + BASE_CTX, SVNT, COMP, COMP_VAR> { public: Upgradeable_Context_Impl (Components::CCMHome_ptr home, |