diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-11-03 22:33:41 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-11-03 22:33:41 +0000 |
| commit | bda7b992cadec64b8b239879541be51feb374c0a (patch) | |
| tree | 53554da4d9b7427bef7dfd738d8c5910893769d9 | |
| parent | 109a3362fe940edc09ec09944ef54e4d1dd448c2 (diff) | |
| download | ATCD-bda7b992cadec64b8b239879541be51feb374c0a.tar.gz | |
ChangeLogTag:Wed Nov 3 22:32:18 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/CIDLC/ServantSourceGenerator.cpp | 6 | ||||
| -rw-r--r-- | TAO/CIAO/ChangeLog | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp index f0feb5de717..b06dc8d5488 100644 --- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp +++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp @@ -1175,7 +1175,7 @@ namespace << "::Components::CCMHome_ptr home," << endl << "::CIAO::Session_Container *c," << endl << t.name () << "_Servant *sv)" << endl - << " : ::CIAO::Context_Impl_Base (home, c), " << endl + << " : ACE_NESTED_CLASS (CIAO, Context_Impl_Base (home, c)), " << endl << " ctx_svnt_base (home, c, sv)" << endl << "{" << "}"; @@ -2436,7 +2436,7 @@ namespace << "_ptr exe," << endl << "::Components::CCMHome_ptr h," << endl << "::CIAO::Session_Container *c)" << endl - << " : ::CIAO::Servant_Impl_Base (c)," << endl + << " : ACE_NESTED_CLASS (CIAO, Servant_Impl_Base (c))," << endl << " comp_svnt_base (exe, c)" << endl << "{" << "this->context_ = " @@ -3283,7 +3283,7 @@ namespace << t.scoped_name ().scope_name () << "::CCM_" << t.name () << "_ptr exe," << endl << "::CIAO::Session_Container *c)" << endl - << " : ::CIAO::Home_Servant_Impl_Base (c)," << endl + << " : ACE_NESTED_CLASS (CIAO, Home_Servant_Impl_Base (c))," << endl << " home_svnt_base (exe, c)" << endl << "{" << "}"; diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 5a81b0f378e..f3cdbbdeadd 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Nov 3 22:32:18 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * CIDLC/ServantSourceGenerator.cpp (namespace): + + VC6 error fixes. Grr...! + Wed Nov 3 12:38:21 2004 Jaiganesh B <jai@dre.vanderbilt.edu> * DAnCE/RepositoryManager/Update_Plan.cpp: |