summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-03-13 15:09:20 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-03-13 15:09:20 +0000
commitd21ecdd2eb661190addd396587f2c598ccb3f981 (patch)
tree53f61139ba322ac2e8339df6e465466f22f2060c
parentad8b9ca6be2f5962b69614472c5f2bb3382f8ed9 (diff)
downloadATCD-d21ecdd2eb661190addd396587f2c598ccb3f981.tar.gz
ChangeLogTag: Thu Mar 13 09:05:20 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h12
3 files changed, 16 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c8968919d24..502c31c739e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu Mar 13 09:05:20 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
+ * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h:
+
+ Fixed the throw specs of several functions so the
+ declaration matches the definition.
+
Thu Mar 13 000:14:10 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
* orbsvcs/orbsvcs/Log/PersistStore.cpp (retrieve):
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index fc20db23b4b..dc532a474e4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -576,7 +576,6 @@ TAO_IFR_Service_Utils::pre_exist (
CORBA::DefinitionKind kind
ACE_ENV_ARG_DECL
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_Service_Utils::id_exists (id,
repo
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index c68820466e0..582ed797a0a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -109,7 +109,8 @@ public:
static void valid_container (CORBA::DefinitionKind container_kind,
CORBA::DefinitionKind contained_kind
- ACE_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL)
+ ACE_THROW_SPEC ((CORBA::SystemException));
/// Checks for illegal member type in given container type.
static void pre_exist (const char *id,
@@ -122,21 +123,24 @@ public:
static void id_exists (const char *id,
TAO_Repository_i *repo
- ACE_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL)
+ ACE_THROW_SPEC ((CORBA::SystemException));
/// Checks for a global repository id clash.
static void name_exists (name_clash_checker checker,
ACE_Configuration_Section_Key &key,
TAO_Repository_i *repo,
CORBA::DefinitionKind kind
- ACE_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL)
+ ACE_THROW_SPEC ((CORBA::SystemException));
/// Checks for a local name clash.
static void check_subsection (name_clash_checker checker,
const char *sub_section,
ACE_Configuration *config,
ACE_Configuration_Section_Key &key
- ACE_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL)
+ ACE_THROW_SPEC ((CORBA::SystemException));
/// Used by interfaces and components to check for name clashes
/// in the attributes, operations, or component ports subsections.