summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-05-02 00:52:07 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-05-02 00:52:07 +0000
commitf1af0821be8c259009b4ae81ba80f637a6bf04b3 (patch)
tree2c8ad4e3340953437e316265ea455225775fed40
parent33255b35aa0ef148f8d80198ce7c9f06281e624a (diff)
downloadATCD-f1af0821be8c259009b4ae81ba80f637a6bf04b3.tar.gz
ChangeLogTag: 'head -1 ChangeLog'
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a12
-rw-r--r--TAO/tao/DynamicAny/DynamicAny.cpp2
-rw-r--r--TAO/tao/DynamicAny/DynamicAny.h2
-rw-r--r--TAO/tao/IORManipulation/IORManip_Loader.cpp2
-rw-r--r--TAO/tao/IORManipulation/IORManip_Loader.h2
-rw-r--r--TAO/tao/Messaging_Policy_i.cpp2
-rw-r--r--TAO/tao/Messaging_Policy_i.h2
-rw-r--r--TAO/tao/PortableServer/POA.cpp4
-rw-r--r--TAO/tao/RT_Policy_i.cpp50
-rw-r--r--TAO/tao/RT_Policy_i.h42
10 files changed, 66 insertions, 54 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index f5ba027407f..0cbc8b03edd 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Tue May 01 19:45:11 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tao/Buffering_Constraint_Policy.{h,cpp}:
+ * tao/DynamicAny/DynamicAny.{h,cpp}:
+ * tao/IORManipulation/IORManip_Loader.{h,cpp}:
+ * tao/Messaging_Policy_i.{h,cpp}:
+ * tao/PortableServer/POA.cpp:
+ * tao/RT_Policy_i.{h,cpp}: Changed the empty ACE_THROW_SPEC
+ (()) with ACE_THROW_SPEC ((CORBA::SystemException)) so that
+ TAO can compile with FORTE 6.1. Thanks to Russ Noseworthy
+ for the patches.
+
Tue May 01 19:00:11 2001 Balachandran Natarajan <bala@cs.wustl.edu>
* orbsvcs/examples/RtEC/MCast/AddrServer.{h,cpp}:
diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp
index 37f7699d362..d1657153f7e 100644
--- a/TAO/tao/DynamicAny/DynamicAny.cpp
+++ b/TAO/tao/DynamicAny/DynamicAny.cpp
@@ -28,7 +28,7 @@ TAO_DynamicAny_Loader::create_object (CORBA::ORB_ptr,
int,
char *[],
CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Object_ptr obj;
ACE_NEW_RETURN (obj,
diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h
index 688d52d17ec..4e66924831b 100644
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ b/TAO/tao/DynamicAny/DynamicAny.h
@@ -37,7 +37,7 @@ public:
int argc,
char *argv [],
CORBA::Environment &)
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
// Creates a DynamicAny factory and returns it.
static int Initializer (void);
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp
index c10a8b42614..5b53575986c 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp
@@ -28,7 +28,7 @@ TAO_IORManip_Loader::create_object (CORBA::ORB_ptr,
int,
char *[],
CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Object_ptr obj;
ACE_NEW_RETURN (obj,
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h
index 2d655f7bf60..ea03db3fe34 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.h
+++ b/TAO/tao/IORManipulation/IORManip_Loader.h
@@ -37,7 +37,7 @@ public:
int argc,
char *argv [],
CORBA::Environment &)
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
// Creates a IORManip factory and returns it.
static int Initializer (void);
diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp
index 0aeea2ea279..5af3bfd0e0d 100644
--- a/TAO/tao/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging_Policy_i.cpp
@@ -26,7 +26,7 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TA
TimeBase::TimeT
TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->relative_expiry_;
}
diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h
index b156d03ebe8..436238a2980 100644
--- a/TAO/tao/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging_Policy_i.h
@@ -62,7 +62,7 @@ public:
// = The Messaging::RelativeRoundtripTimeoutPolicy methods
virtual TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV)
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 1a13c268619..fad35c1640a 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -61,12 +61,12 @@ public:
: orb_ (orb) {}
virtual void ping (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
}
virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0, ACE_TRY_ENV);
ACE_CHECK;
diff --git a/TAO/tao/RT_Policy_i.cpp b/TAO/tao/RT_Policy_i.cpp
index 22c2885f760..68874ce0c39 100644
--- a/TAO/tao/RT_Policy_i.cpp
+++ b/TAO/tao/RT_Policy_i.cpp
@@ -116,7 +116,7 @@ TAO_ThreadpoolPolicy::~TAO_ThreadpoolPolicy (void)
RTCORBA::ThreadpoolId
TAO_ThreadpoolPolicy::threadpool (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->id_;
}
@@ -293,7 +293,7 @@ TAO_TCP_Properties::~TAO_TCP_Properties (void)
CORBA::Long
TAO_TCP_Properties::send_buffer_size (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->send_buffer_size_;
}
@@ -301,14 +301,14 @@ TAO_TCP_Properties::send_buffer_size (CORBA::Environment &)
void
TAO_TCP_Properties::send_buffer_size (CORBA::Long send_buffer_size,
CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
this->send_buffer_size_ = send_buffer_size;
}
CORBA::Long
TAO_TCP_Properties::recv_buffer_size (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->recv_buffer_size_;
}
@@ -316,14 +316,14 @@ TAO_TCP_Properties::recv_buffer_size (CORBA::Environment &)
void
TAO_TCP_Properties::recv_buffer_size (CORBA::Long recv_buffer_size,
CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
this->recv_buffer_size_ = recv_buffer_size;
}
CORBA::Boolean
TAO_TCP_Properties::keep_alive (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->keep_alive_;
}
@@ -331,14 +331,14 @@ TAO_TCP_Properties::keep_alive (CORBA::Environment &)
void
TAO_TCP_Properties::keep_alive (CORBA::Boolean keep_alive,
CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
this->keep_alive_ = keep_alive;
}
CORBA::Boolean
TAO_TCP_Properties::dont_route (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->dont_route_;
}
@@ -346,13 +346,13 @@ TAO_TCP_Properties::dont_route (CORBA::Environment &)
void
TAO_TCP_Properties::dont_route (CORBA::Boolean dont_route,
CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
this->dont_route_ = dont_route;
}
CORBA::Boolean TAO_TCP_Properties::no_delay (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->no_delay_;
}
@@ -360,7 +360,7 @@ CORBA::Boolean TAO_TCP_Properties::no_delay (CORBA::Environment &)
void
TAO_TCP_Properties::no_delay (CORBA::Boolean no_delay,
CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
this->no_delay_ = no_delay;
}
@@ -412,7 +412,7 @@ TAO_Unix_Domain_Properties::~TAO_Unix_Domain_Properties (void)
CORBA::Long
TAO_Unix_Domain_Properties::send_buffer_size (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->send_buffer_size_;
}
@@ -420,14 +420,14 @@ TAO_Unix_Domain_Properties::send_buffer_size (CORBA::Environment &)
void
TAO_Unix_Domain_Properties::send_buffer_size (CORBA::Long send_buffer_size,
CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
this->send_buffer_size_ = send_buffer_size;
}
CORBA::Long
TAO_Unix_Domain_Properties::recv_buffer_size (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->recv_buffer_size_;
}
@@ -435,7 +435,7 @@ TAO_Unix_Domain_Properties::recv_buffer_size (CORBA::Environment &)
void
TAO_Unix_Domain_Properties::recv_buffer_size (CORBA::Long recv_buffer_size,
CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
this->recv_buffer_size_ = recv_buffer_size;
}
@@ -471,7 +471,7 @@ TAO_SMEM_Properties::~TAO_SMEM_Properties (void)
CORBA::Long
TAO_SMEM_Properties::preallocate_buffer_size (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->preallocate_buffer_size_;
}
@@ -479,14 +479,14 @@ TAO_SMEM_Properties::preallocate_buffer_size (CORBA::Environment &)
void
TAO_SMEM_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size,
CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
this->preallocate_buffer_size_ = preallocate_buffer_size;
}
char *
TAO_SMEM_Properties::mmap_filename (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->mmap_filename_.rep ();
}
@@ -494,14 +494,14 @@ TAO_SMEM_Properties::mmap_filename (CORBA::Environment &)
void
TAO_SMEM_Properties::mmap_filename (const char * mmap_filename,
CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
this->mmap_filename_.set (mmap_filename);
}
char *
TAO_SMEM_Properties::mmap_lockname (CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->mmap_lockname_.rep ();
}
@@ -509,7 +509,7 @@ TAO_SMEM_Properties::mmap_lockname (CORBA::Environment &)
void
TAO_SMEM_Properties::mmap_lockname (const char * mmap_lockname,
CORBA::Environment &)
- ACE_THROW_SPEC (())
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
this->mmap_lockname_.set (mmap_lockname);
}
@@ -603,9 +603,9 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
int &no_delay,
const char *protocol_type)
{
- RTCORBA::ProtocolProperties_var properties =
+ RTCORBA::ProtocolProperties_var properties =
RTCORBA::ProtocolProperties::_nil ();
-
+
// ServerProtocolProperties policy controls protocols configuration.
// Look for protocol properties in the effective ServerProtocolPolicy.
CORBA::Policy_var policy =
@@ -814,9 +814,9 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
int &no_delay,
const char *protocol_type)
{
- RTCORBA::ProtocolProperties_var properties =
+ RTCORBA::ProtocolProperties_var properties =
RTCORBA::ProtocolProperties::_nil ();
-
+
// Check ORB-level override for properties.
CORBA::Policy_var policy =
orb_core->policy_manager ()->client_protocol ();
diff --git a/TAO/tao/RT_Policy_i.h b/TAO/tao/RT_Policy_i.h
index 3743075b532..98b77ea1388 100644
--- a/TAO/tao/RT_Policy_i.h
+++ b/TAO/tao/RT_Policy_i.h
@@ -133,7 +133,7 @@ public:
virtual RTCORBA::ThreadpoolId threadpool (CORBA::Environment
&ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::PolicyType policy_type (CORBA::Environment
&ACE_TRY_ENV =
@@ -442,49 +442,49 @@ public:
virtual CORBA::Long send_buffer_size (CORBA::Environment
&ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void send_buffer_size (CORBA::Long send_buffer_size,
CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::Long recv_buffer_size (CORBA::Environment
&ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void recv_buffer_size (CORBA::Long recv_buffer_size,
CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::Boolean keep_alive (CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void keep_alive (CORBA::Boolean keep_alive,
CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::Boolean dont_route (CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void dont_route (CORBA::Boolean dont_route,
CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::Boolean no_delay (CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void no_delay (CORBA::Boolean no_delay,
CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
/// This method writes a CDR representation of TCPProtocolProperties.
@@ -534,22 +534,22 @@ public:
virtual CORBA::Long send_buffer_size (CORBA::Environment
&ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void send_buffer_size (CORBA::Long send_buffer_size,
CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::Long recv_buffer_size (CORBA::Environment
&ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void recv_buffer_size (CORBA::Long recv_buffer_size,
CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
/**
* This method writes the CDR encapsulation of an instance of
@@ -607,31 +607,31 @@ public:
&ACE_TRY_ENV =
TAO_default_environment
())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void preallocate_buffer_size (CORBA::Long preallocate_buffer_size,
CORBA::Environment
&ACE_TRY_ENV = TAO_default_environment
())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual char * mmap_filename (CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void mmap_filename (const char * mmap_filename,
CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual char * mmap_lockname (CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void mmap_lockname (const char * mmap_lockname,
CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ())
- ACE_THROW_SPEC (());
+ ACE_THROW_SPEC ((CORBA::SystemException));
/**
* This method writes the CDR encapsulation of an instance of