summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2004-11-02 04:46:29 +0000
committerbala <balanatarajan@users.noreply.github.com>2004-11-02 04:46:29 +0000
commitd03fb215f2e8dcb6c4fdeb423c528364424d9685 (patch)
tree821a8566ce6468e31a21ffb317b01956469c29c1
parent86e289aa98bd543ee8ba0a9fc0d37b9aacf19dbf (diff)
downloadATCD-d03fb215f2e8dcb6c4fdeb423c528364424d9685.tar.gz
ChangeLogTag:Tue Nov 2 04:45:44 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/CIAO/CIDLC/ServantSourceGenerator.cpp6
-rw-r--r--TAO/CIAO/ChangeLog7
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
index f40248d5c31..ac794849fe4 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
- << " : Context_Impl_Base (home, c), " << endl
+ << " : ::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
- << " : Servant_Impl_Base (c)," << endl
+ << " : ::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
- << " : Home_Servant_Impl_Base (c)," << endl
+ << " : ::CIAO::Home_Servant_Impl_Base (c)," << endl
<< " home_svnt_base (exe, c)" << endl
<< "{"
<< "}";
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 14bb396adad..be1185c6945 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov 2 04:45:44 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * CIDLC/ServantSourceGenerator.cpp:
+
+ Addressing compile errors in Borland. Thanks to Johnny for the
+ suggestion.
+
Mon Nov 1 15:09:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
* VERSION: