diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-13 12:12:20 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-13 12:12:20 +0000 |
| commit | 3447fedf29a5fc85b1c900aa90e6278fb29a271d (patch) | |
| tree | 873568e2b494d0e3bcf36fe0f01b91279880867a | |
| parent | cd64a4bfd2102a451349589915fd6ecd65d28892 (diff) | |
| download | ATCD-3447fedf29a5fc85b1c900aa90e6278fb29a271d.tar.gz | |
ChangeLogTag:Mon Sep 13 07:11:06 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Port_Activator.h | 4 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp | 1 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Port_Activator.h | 2 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Servant_Activator.cpp | 1 |
5 files changed, 15 insertions, 3 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index c73a55285ad..ad74b5993c2 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Mon Sep 13 07:11:06 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * DAnCE/ciao/Port_Activator.h: + * DAnCE/ciao/Servant_Activator.cpp: + * ciao/Port_Activator.h: + * ciao/Servant_Activator.cpp: + + Fixes for MSVC++ compilation errors. Inspite of being careful I + introduced a couple of VC++ anathemas. + Mon Sep 13 06:16:31 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * DAnCE/ciao/Container_Base.cpp: diff --git a/TAO/CIAO/DAnCE/ciao/Port_Activator.h b/TAO/CIAO/DAnCE/ciao/Port_Activator.h index c248d444594..71245214879 100644 --- a/TAO/CIAO/DAnCE/ciao/Port_Activator.h +++ b/TAO/CIAO/DAnCE/ciao/Port_Activator.h @@ -47,7 +47,7 @@ namespace CIAO Port_Activator (const char *oid, const char *name, - Port_Activator::Type t); + Type t); virtual ~Port_Activator (void); @@ -56,7 +56,7 @@ namespace CIAO /// Activate the servant reponsible for this port. /** - * There are intentionally no exception specifications. It is the + * There are intentionally no throw specifications. It is the * caller's responsibility to handle CORBA and C++ * specifications. */ diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp index becddbb8018..4f6dce18a5c 100644 --- a/TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp +++ b/TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp @@ -2,6 +2,7 @@ #include "CIAO_common.h" #include "Port_Activator.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" ACE_RCSID (ciao, Servant_Activator, diff --git a/TAO/CIAO/ciao/Port_Activator.h b/TAO/CIAO/ciao/Port_Activator.h index c248d444594..dbe8f184a93 100644 --- a/TAO/CIAO/ciao/Port_Activator.h +++ b/TAO/CIAO/ciao/Port_Activator.h @@ -47,7 +47,7 @@ namespace CIAO Port_Activator (const char *oid, const char *name, - Port_Activator::Type t); + Type t); virtual ~Port_Activator (void); diff --git a/TAO/CIAO/ciao/Servant_Activator.cpp b/TAO/CIAO/ciao/Servant_Activator.cpp index becddbb8018..4f6dce18a5c 100644 --- a/TAO/CIAO/ciao/Servant_Activator.cpp +++ b/TAO/CIAO/ciao/Servant_Activator.cpp @@ -2,6 +2,7 @@ #include "CIAO_common.h" #include "Port_Activator.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" ACE_RCSID (ciao, Servant_Activator, |