diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-16 15:17:47 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-16 15:17:47 +0000 |
| commit | c392136b8c9e41a0255774665f24446c429c3a7f (patch) | |
| tree | 69560c5381c0de3519b9a5d423294019a3e76d8d | |
| parent | c9b938062aae9c664f08f85c0bd0dd4213b59325 (diff) | |
| download | ATCD-c392136b8c9e41a0255774665f24446c429c3a7f.tar.gz | |
ChangeLogTag: Thu Sep 16 10:15:04 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h | 1 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index eea7ac498d3..359c70cc43b 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,16 @@ +Thu Sep 16 10:15:04 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * DAnCE/ciao/Servant_Impl_Base.h: + + Added inheritance to Servant_Impl_Base of + POA_Components::CCMObject to bring it in sync with the + version in regular CIAO/ciao. + + * DAnCE/ciao/Servant_Impl_T.h: + + Made inheritance of Servant_Impl_Base virtual, to bring it + in sync with the version in regular CIAO/ciao. + Thu Sep 16 08:44:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/ciao/Servant_Activator.cpp: diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h index e153d865769..272fa8f3d5a 100644 --- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h +++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h @@ -42,6 +42,7 @@ namespace CIAO * Servant_Impl. */ class CIAO_SERVER_Export Servant_Impl_Base + : public virtual POA_Components::CCMObject { public: Servant_Impl_Base (Session_Container * c); diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h index 067366f003d..45f223f57b5 100644 --- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h +++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h @@ -43,7 +43,7 @@ namespace CIAO typename EXEC_VAR, typename CONTEXT> class Servant_Impl : public virtual BASE_SKEL, - public Servant_Impl_Base + public virtual Servant_Impl_Base { public: Servant_Impl (EXEC * exe, |