summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-11-03 22:33:41 +0000
committerbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-11-03 22:33:41 +0000
commitb1a5883be3af902cf9c2e72b675d0171688e83c3 (patch)
tree53554da4d9b7427bef7dfd738d8c5910893769d9 /TAO
parent71cca7c4a6fcdf23667e8498fe36453a0d9e3f4e (diff)
downloadATCD-b1a5883be3af902cf9c2e72b675d0171688e83c3.tar.gz
ChangeLogTag:Wed Nov 3 22:32:18 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/CIAO/CIDLC/ServantSourceGenerator.cpp6
-rw-r--r--TAO/CIAO/ChangeLog6
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: