summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-08-04 04:12:17 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-08-04 04:12:17 +0000
commit4d335eceb6fab31237de4c736d6d782832a6b85a (patch)
tree31118d59936ce5ba9a34ad4d6463caa0f4eea5bf
parent336bdc564b8dc4507a33fa3687aeacefb46a51ae (diff)
downloadATCD-4d335eceb6fab31237de4c736d6d782832a6b85a.tar.gz
*** empty log message ***
-rw-r--r--TAO/CIAO/tools/RTComponentServer/ChangeLog6
-rw-r--r--TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp7
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/CIAO/tools/RTComponentServer/ChangeLog b/TAO/CIAO/tools/RTComponentServer/ChangeLog
index 187aab3944f..8bb32361c41 100644
--- a/TAO/CIAO/tools/RTComponentServer/ChangeLog
+++ b/TAO/CIAO/tools/RTComponentServer/ChangeLog
@@ -1,3 +1,9 @@
+Sun Aug 3 23:12:20 2003 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * RTConfig_Manager.cpp: Fixed mismatched throw specifications.
+ Added inclusion of "ace/SString.h" as ACE now only includes
+ "ace/SStringfwd.h".
+
Sun Aug 03 00:45:59 2003 Nanbor Wang <nanbor@cs.wustl.edu>
* RTConfig_Manager.cpp: Fixed some accidental pastings of code.
diff --git a/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp b/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp
index 52be9b21b55..0caf61cfb2a 100644
--- a/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp
+++ b/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp
@@ -1,6 +1,7 @@
// $Id$
#include "RTConfig_Manager.h"
+#include "ace/SString.h"
#if !defined (__ACE_INLINE__)
# include "RTConfig_Manager.inl"
@@ -10,7 +11,7 @@ void
CIAO::RTResource_Config_Manager::init
(const CIAO::RTConfiguration::RTORB_Resources_Info &info
ACE_ENV_ARG_DECL)
- // @@ THROW SPEC HERE?
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ULong i;
@@ -64,7 +65,7 @@ CIAO::RTResource_Config_Manager::init
void
CIAO::RTResource_Config_Manager::fini (ACE_ENV_SINGLE_ARG_DECL)
- // @@ THROW SPEC?
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
TP_MAP::ITERATOR iter = this->threadpool_map_.begin ();
TP_MAP::ITERATOR end = this->threadpool_map_.end ();
@@ -81,7 +82,7 @@ CIAO::RTResource_Config_Manager::fini (ACE_ENV_SINGLE_ARG_DECL)
RTCORBA::ThreadpoolId
CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name
ACE_ENV_ARG_DECL)
- // @@ THROW SPEC?
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
if (name == 0)
{