summaryrefslogtreecommitdiff
path: root/TAO/tao/RTCORBA
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/RTCORBA')
-rw-r--r--TAO/tao/RTCORBA/RTCORBAC.h351
-rw-r--r--TAO/tao/RTCORBA/RT_Current.cpp11
-rw-r--r--TAO/tao/RTCORBA/RT_Current.h6
-rw-r--r--TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp8
-rw-r--r--TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp1
-rw-r--r--TAO/tao/RTCORBA/RT_Mutex.cpp7
-rw-r--r--TAO/tao/RTCORBA/RT_Mutex.h9
-rw-r--r--TAO/tao/RTCORBA/RT_ORB.cpp26
-rw-r--r--TAO/tao/RTCORBA/RT_ORB.h67
-rw-r--r--TAO/tao/RTCORBA/RT_ORBInitializer.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_ORBInitializer.h6
-rw-r--r--TAO/tao/RTCORBA/RT_PolicyFactory.cpp8
-rw-r--r--TAO/tao/RTCORBA/RT_PolicyFactory.h8
-rw-r--r--TAO/tao/RTCORBA/RT_Policy_i.cpp74
-rw-r--r--TAO/tao/RTCORBA/RT_Policy_i.h213
-rw-r--r--TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp10
-rw-r--r--TAO/tao/RTCORBA/RT_Stub.cpp2
-rw-r--r--TAO/tao/RTCORBA/Thread_Pool.cpp20
-rw-r--r--TAO/tao/RTCORBA/Thread_Pool.h19
19 files changed, 218 insertions, 630 deletions
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index 7a3f336dd87..e48a877fb3d 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -49,7 +49,6 @@
#include "tao/ORB.h"
#include "tao/TimeBaseC.h"
#include "tao/SystemException.h"
-#include "tao/Environment.h"
#include "tao/Object.h"
#include "tao/Sequence_T.h"
#include "tao/Objref_VarOut_T.h"
@@ -305,9 +304,7 @@ namespace RTCORBA
virtual ::RTCORBA::PriorityModel priority_model (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -315,9 +312,7 @@ namespace RTCORBA
virtual RTCORBA::Priority server_priority (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -325,9 +320,7 @@ namespace RTCORBA
virtual ::CORBA::Policy_ptr copy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -335,9 +328,7 @@ namespace RTCORBA
virtual void destroy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -439,9 +430,7 @@ namespace RTCORBA
virtual RTCORBA::ThreadpoolId threadpool (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -449,9 +438,7 @@ namespace RTCORBA
virtual ::CORBA::Policy_ptr copy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -459,9 +446,7 @@ namespace RTCORBA
virtual void destroy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -740,9 +725,7 @@ namespace RTCORBA
virtual ::RTCORBA::ProtocolList * protocols (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -750,9 +733,7 @@ namespace RTCORBA
virtual ::CORBA::Policy_ptr copy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -760,9 +741,7 @@ namespace RTCORBA
virtual void destroy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -864,9 +843,7 @@ namespace RTCORBA
virtual ::RTCORBA::ProtocolList * protocols (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -874,9 +851,7 @@ namespace RTCORBA
virtual ::CORBA::Policy_ptr copy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -884,9 +859,7 @@ namespace RTCORBA
virtual void destroy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -988,9 +961,7 @@ namespace RTCORBA
virtual ::CORBA::Policy_ptr copy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -998,9 +969,7 @@ namespace RTCORBA
virtual void destroy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -1097,9 +1066,7 @@ namespace RTCORBA
virtual CORBA::Long send_buffer_size (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1108,9 +1075,7 @@ namespace RTCORBA
::CORBA::Long send_buffer_size
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1118,9 +1083,7 @@ namespace RTCORBA
virtual CORBA::Long recv_buffer_size (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1129,9 +1092,7 @@ namespace RTCORBA
::CORBA::Long recv_buffer_size
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1139,9 +1100,7 @@ namespace RTCORBA
virtual CORBA::Boolean keep_alive (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1150,9 +1109,7 @@ namespace RTCORBA
::CORBA::Boolean keep_alive
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1160,9 +1117,7 @@ namespace RTCORBA
virtual CORBA::Boolean dont_route (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1171,9 +1126,7 @@ namespace RTCORBA
::CORBA::Boolean dont_route
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1181,9 +1134,7 @@ namespace RTCORBA
virtual CORBA::Boolean no_delay (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1192,9 +1143,7 @@ namespace RTCORBA
::CORBA::Boolean no_delay
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1202,9 +1151,7 @@ namespace RTCORBA
virtual CORBA::Boolean enable_network_priority (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1213,9 +1160,7 @@ namespace RTCORBA
::CORBA::Boolean enable_network_priority
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -1401,9 +1346,7 @@ namespace RTCORBA
virtual CORBA::Long send_buffer_size (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1412,9 +1355,7 @@ namespace RTCORBA
::CORBA::Long send_buffer_size
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1422,9 +1363,7 @@ namespace RTCORBA
virtual CORBA::Long recv_buffer_size (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1433,9 +1372,7 @@ namespace RTCORBA
::CORBA::Long recv_buffer_size
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -1532,9 +1469,7 @@ namespace RTCORBA
virtual CORBA::Long send_buffer_size (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1543,9 +1478,7 @@ namespace RTCORBA
::CORBA::Long send_buffer_size
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1553,9 +1486,7 @@ namespace RTCORBA
virtual CORBA::Long recv_buffer_size (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1564,9 +1495,7 @@ namespace RTCORBA
::CORBA::Long recv_buffer_size
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1574,9 +1503,7 @@ namespace RTCORBA
virtual CORBA::Boolean keep_alive (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1585,9 +1512,7 @@ namespace RTCORBA
::CORBA::Boolean keep_alive
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1595,9 +1520,7 @@ namespace RTCORBA
virtual CORBA::Boolean dont_route (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1606,9 +1529,7 @@ namespace RTCORBA
::CORBA::Boolean dont_route
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1616,9 +1537,7 @@ namespace RTCORBA
virtual CORBA::Boolean no_delay (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1627,9 +1546,7 @@ namespace RTCORBA
::CORBA::Boolean no_delay
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1637,9 +1554,7 @@ namespace RTCORBA
virtual CORBA::Long preallocate_buffer_size (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1648,9 +1563,7 @@ namespace RTCORBA
::CORBA::Long preallocate_buffer_size
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1658,9 +1571,7 @@ namespace RTCORBA
virtual char * mmap_filename (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1669,9 +1580,7 @@ namespace RTCORBA
const char * mmap_filename
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1679,9 +1588,7 @@ namespace RTCORBA
virtual char * mmap_lockname (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1690,9 +1597,7 @@ namespace RTCORBA
const char * mmap_lockname
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -1789,9 +1694,7 @@ namespace RTCORBA
virtual CORBA::Boolean enable_network_priority (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1800,9 +1703,7 @@ namespace RTCORBA
::CORBA::Boolean enable_network_priority
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -1899,9 +1800,7 @@ namespace RTCORBA
virtual CORBA::Long send_buffer_size (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1910,9 +1809,7 @@ namespace RTCORBA
::CORBA::Long send_buffer_size
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1920,9 +1817,7 @@ namespace RTCORBA
virtual CORBA::Long recv_buffer_size (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1931,9 +1826,7 @@ namespace RTCORBA
::CORBA::Long recv_buffer_size
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1941,9 +1834,7 @@ namespace RTCORBA
virtual CORBA::Boolean keep_alive (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1952,9 +1843,7 @@ namespace RTCORBA
::CORBA::Boolean keep_alive
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1962,9 +1851,7 @@ namespace RTCORBA
virtual CORBA::Boolean dont_route (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1973,9 +1860,7 @@ namespace RTCORBA
::CORBA::Boolean dont_route
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1983,9 +1868,7 @@ namespace RTCORBA
virtual CORBA::Boolean no_delay (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -1994,9 +1877,7 @@ namespace RTCORBA
::CORBA::Boolean no_delay
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2004,9 +1885,7 @@ namespace RTCORBA
virtual CORBA::Boolean enable_network_priority (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2015,9 +1894,7 @@ namespace RTCORBA
::CORBA::Boolean enable_network_priority
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -2201,9 +2078,7 @@ namespace RTCORBA
virtual ::RTCORBA::PriorityBands * priority_bands (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2211,9 +2086,7 @@ namespace RTCORBA
virtual ::CORBA::Policy_ptr copy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2221,9 +2094,7 @@ namespace RTCORBA
virtual void destroy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -2320,9 +2191,7 @@ namespace RTCORBA
virtual RTCORBA::Priority the_priority (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2331,9 +2200,7 @@ namespace RTCORBA
::RTCORBA::Priority the_priority
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -2430,9 +2297,7 @@ namespace RTCORBA
virtual void lock (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2440,9 +2305,7 @@ namespace RTCORBA
virtual void unlock (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2451,9 +2314,7 @@ namespace RTCORBA
::TimeBase::TimeT max_wait
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
@@ -2550,9 +2411,7 @@ namespace RTCORBA
virtual ::RTCORBA::Mutex_ptr create_mutex (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2561,9 +2420,7 @@ namespace RTCORBA
::RTCORBA::Mutex_ptr the_mutex
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_exception/exception_ch.cpp:53
@@ -2623,9 +2480,7 @@ namespace RTCORBA
::CORBA::Boolean_out created_flag
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2634,10 +2489,7 @@ namespace RTCORBA
const char * name
)
- ACE_THROW_SPEC ((
- CORBA::SystemException,
- ::RTCORBA::RTORB::MutexNotFound
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2651,9 +2503,7 @@ namespace RTCORBA
::CORBA::Boolean enable_network_priority
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2663,9 +2513,7 @@ namespace RTCORBA
::CORBA::Long recv_buffer_size
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2681,9 +2529,7 @@ namespace RTCORBA
const char * mmap_lockname
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2692,9 +2538,7 @@ namespace RTCORBA
::CORBA::Boolean enable_network_priority
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2708,9 +2552,7 @@ namespace RTCORBA
::CORBA::Boolean enable_network_priority
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_exception/exception_ch.cpp:53
@@ -2775,9 +2617,7 @@ namespace RTCORBA
::CORBA::ULong max_request_buffer_size
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2791,9 +2631,7 @@ namespace RTCORBA
::CORBA::ULong max_request_buffer_size
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2802,10 +2640,7 @@ namespace RTCORBA
::RTCORBA::ThreadpoolId threadpool
)
- ACE_THROW_SPEC ((
- CORBA::SystemException,
- ::RTCORBA::RTORB::InvalidThreadpool
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2815,9 +2650,7 @@ namespace RTCORBA
::RTCORBA::Priority server_priority
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2826,9 +2659,7 @@ namespace RTCORBA
::RTCORBA::ThreadpoolId threadpool
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2837,9 +2668,7 @@ namespace RTCORBA
const ::RTCORBA::PriorityBands & priority_bands
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2848,9 +2677,7 @@ namespace RTCORBA
const ::RTCORBA::ProtocolList & protocols
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2859,9 +2686,7 @@ namespace RTCORBA
const ::RTCORBA::ProtocolList & protocols
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
@@ -2869,9 +2694,7 @@ namespace RTCORBA
virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
void
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ = 0;
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ch.cpp:210
diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp
index 196877f5424..322e8634590 100644
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ b/TAO/tao/RTCORBA/RT_Current.cpp
@@ -11,6 +11,7 @@
#include "tao/Stub.h"
#include "tao/ORB_Core.h"
#include "tao/Protocols_Hooks.h"
+#include "tao/SystemException.h"
#include "ace/Thread.h"
@@ -31,15 +32,12 @@ TAO_RT_Current::~TAO_RT_Current (void)
RTCORBA::Priority
TAO_RT_Current::the_priority (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks ();
RTCORBA::Priority priority;
- int const result = tph->get_thread_CORBA_priority (priority);
-
- if (result == -1)
+ if (tph->get_thread_CORBA_priority (priority) == -1)
throw ::CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO);
return priority;
@@ -47,14 +45,11 @@ TAO_RT_Current::the_priority (void)
void
TAO_RT_Current::the_priority (RTCORBA::Priority the_priority)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks ();
- int const result = tph->set_thread_CORBA_priority (the_priority);
-
- if (result == -1)
+ if (tph->set_thread_CORBA_priority (the_priority) == -1)
throw ::CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO);
}
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index c80d668dd8e..7acf3f227cf 100644
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ b/TAO/tao/RTCORBA/RT_Current.h
@@ -52,11 +52,9 @@ public:
/// Default constructor.
TAO_RT_Current (TAO_ORB_Core *orb_core);
- virtual RTCORBA::Priority the_priority (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual RTCORBA::Priority the_priority (void);
- virtual void the_priority (RTCORBA::Priority the_priority)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void the_priority (RTCORBA::Priority the_priority);
protected:
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
index bc92b6104dc..1cb9458734c 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -8,6 +8,8 @@
#include "tao/RTCORBA/RT_Stub.h"
+#include "tao/SystemException.h"
+
ACE_RCSID (RTCORBA,
RT_Endpoint_Utils,
"$Id$")
@@ -27,8 +29,7 @@ TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type,
try
{
policy =
- rt_stub->get_cached_policy (type
- );
+ rt_stub->get_cached_policy (type);
}
catch (const ::CORBA::INV_POLICY&)
{
@@ -36,8 +37,7 @@ TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type,
{
CORBA::PolicyList *p = r.inconsistent_policies ();
p->length (1);
- (*p)[0u] = rt_stub->TAO_Stub::get_cached_policy (type
- );
+ (*p)[0u] = rt_stub->TAO_Stub::get_cached_policy (type);
}
throw;
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index e4451641335..1063ce32d97 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -17,6 +17,7 @@
#include "tao/Endpoint.h"
#include "tao/Profile_Transport_Resolver.h"
#include "tao/ORB_Core.h"
+#include "tao/SystemException.h"
ACE_RCSID (RTCORBA,
RT_Invocation_Endpoint_Selectors,
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
index dc830412021..d0c7b4c22ff 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -4,6 +4,7 @@
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
#include "tao/RTCORBA/RT_ORB.h"
+#include "tao/SystemException.h"
#include "ace/OS_NS_sys_time.h"
ACE_RCSID(RTCORBA,
@@ -18,7 +19,6 @@ TAO_RT_Mutex::~TAO_RT_Mutex (void)
void
TAO_RT_Mutex::lock (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->mu_.acquire () != 0)
throw ::CORBA::INTERNAL ();
@@ -26,16 +26,13 @@ TAO_RT_Mutex::lock (void)
void
TAO_RT_Mutex::unlock (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->mu_.release () != 0)
throw ::CORBA::INTERNAL ();
}
CORBA::Boolean
-TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time
- )
- ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time)
{
int result;
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index 89732b0008b..0b3d00bd600 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -58,12 +58,10 @@ class TAO_RTCORBA_Export TAO_RT_Mutex
public:
/// Acquire the lock.
- virtual void lock (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void lock (void);
/// Release the lock.
- virtual void unlock (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void unlock (void);
/**
* Acquire the lock, but only wait up to @a max_wait time. Note
@@ -72,8 +70,7 @@ public:
* using this operation in your program designs.
*/
virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ );
/// Returns the name of the mutex.
virtual const char *name (void) const;
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index 8aacb308375..51c6cf40e1d 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -9,6 +9,7 @@
#include "tao/RTCORBA/Priority_Mapping_Manager.h"
#include "tao/ORB_Core.h"
#include "tao/ORB.h"
+#include "tao/SystemException.h"
#include "tao/RTCORBA/Thread_Pool.h"
#include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h"
#include "ace/Sched_Params.h"
@@ -42,14 +43,12 @@ TAO_RT_ORB::~TAO_RT_ORB (void)
RTCORBA::Mutex_ptr
TAO_RT_ORB::create_mutex (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->mutex_mgr_.create_mutex ();
}
void
TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->mutex_mgr_.destroy_mutex (mutex);
}
@@ -58,14 +57,12 @@ TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex)
RTCORBA::Mutex_ptr
TAO_RT_ORB::create_named_mutex (const char *name,
CORBA::Boolean_out created_flag)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->mutex_mgr_.create_named_mutex (name, created_flag);
}
RTCORBA::Mutex_ptr
TAO_RT_ORB::open_named_mutex (const char *name)
- ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound))
{
return this->mutex_mgr_.open_named_mutex (name);
}
@@ -82,7 +79,6 @@ TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void)
RTCORBA::Mutex_ptr
TAO_Named_RT_Mutex_Manager::create_mutex (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_RT_Mutex *mutex = 0;
ACE_NEW_THROW_EX (mutex,
@@ -101,7 +97,6 @@ TAO_Named_RT_Mutex_Manager::create_mutex (void)
#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
void
TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_RT_Mutex *tao_mutex =
dynamic_cast<TAO_RT_Mutex *> (mutex);
@@ -127,7 +122,6 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex)
#else /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
void
TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
@@ -135,7 +129,6 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr)
RTCORBA::Mutex_ptr
TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
CORBA::Boolean_out created_flag)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
// The following should be atomic.
@@ -185,8 +178,6 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
RTCORBA::Mutex_ptr
TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name)
- ACE_THROW_SPEC ((CORBA::SystemException,
- RTCORBA::RTORB::MutexNotFound))
{
#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
// The following should be atomic.
@@ -218,7 +209,6 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
CORBA::Boolean no_delay,
CORBA::Boolean enable_network_priority
)
- ACE_THROW_SPEC ((CORBA::SystemException ))
{
TAO_TCP_Protocol_Properties *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -239,7 +229,6 @@ TAO_RT_ORB::create_unix_domain_protocol_properties (
CORBA::Long send_buffer_size,
CORBA::Long recv_buffer_size
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_UnixDomain_Protocol_Properties *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -262,7 +251,6 @@ TAO_RT_ORB::create_shared_memory_protocol_properties (
CORBA::Long preallocate_buffer_size,
const char *mmap_filename,
const char *mmap_lockname)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_SharedMemory_Protocol_Properties *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -284,7 +272,6 @@ RTCORBA::UserDatagramProtocolProperties_ptr
TAO_RT_ORB::create_user_datagram_protocol_properties (
CORBA::Boolean enable_network_priority
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_UserDatagram_Protocol_Properties *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -305,7 +292,6 @@ TAO_RT_ORB::create_stream_control_protocol_properties (
CORBA::Boolean no_delay,
CORBA::Boolean enable_network_priority
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_StreamControl_Protocol_Properties *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -331,7 +317,6 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
CORBA::ULong max_buffered_requests,
CORBA::ULong max_request_buffer_size
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->tp_manager_->create_threadpool (stacksize,
static_threads,
@@ -352,7 +337,6 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
CORBA::ULong max_buffered_requests,
CORBA::ULong max_request_buffer_size
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->tp_manager_->create_threadpool_with_lanes (stacksize,
lanes,
@@ -366,8 +350,6 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
void
TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool)
- ACE_THROW_SPEC ((CORBA::SystemException,
- RTCORBA::RTORB::InvalidThreadpool))
{
this->tp_manager_->destroy_threadpool (threadpool);
}
@@ -376,7 +358,6 @@ RTCORBA::PriorityModelPolicy_ptr
TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model,
RTCORBA::Priority server_priority
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_PriorityModelPolicy *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -389,7 +370,6 @@ TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model,
RTCORBA::ThreadpoolPolicy_ptr
TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_ThreadpoolPolicy *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -404,7 +384,6 @@ RTCORBA::PriorityBandedConnectionPolicy_ptr
TAO_RT_ORB::create_priority_banded_connection_policy (const
RTCORBA::PriorityBands & priority_bands
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_PriorityBandedConnectionPolicy *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -417,7 +396,6 @@ TAO_RT_ORB::create_priority_banded_connection_policy (const
RTCORBA::PrivateConnectionPolicy_ptr
TAO_RT_ORB::create_private_connection_policy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_PrivateConnectionPolicy *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -431,7 +409,6 @@ TAO_RT_ORB::create_private_connection_policy (void)
RTCORBA::ServerProtocolPolicy_ptr
TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protocols
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_ServerProtocolPolicy *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -445,7 +422,6 @@ TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protoco
RTCORBA::ClientProtocolPolicy_ptr
TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protocols
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_ClientProtocolPolicy *tmp = 0;
ACE_NEW_THROW_EX (tmp,
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
index 9c5852963c2..f485e2fb64a 100644
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ b/TAO/tao/RTCORBA/RT_ORB.h
@@ -60,18 +60,14 @@ public:
/// Destructor.
~TAO_Named_RT_Mutex_Manager (void);
- RTCORBA::Mutex_ptr create_mutex (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ RTCORBA::Mutex_ptr create_mutex (void);
- void destroy_mutex (RTCORBA::Mutex_ptr the_mutex)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void destroy_mutex (RTCORBA::Mutex_ptr the_mutex);
RTCORBA::Mutex_ptr create_named_mutex (const char *name,
- CORBA::Boolean_out created_flag)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean_out created_flag);
- RTCORBA::Mutex_ptr open_named_mutex (const char * name)
- ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound));
+ RTCORBA::Mutex_ptr open_named_mutex (const char * name);
private:
@@ -112,16 +108,14 @@ public:
* consistant priority inheritance/piority ceiling semantics
* can be guaranteed.
*/
- virtual RTCORBA::Mutex_ptr create_mutex (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual RTCORBA::Mutex_ptr create_mutex (void);
/**
* Destroy a mutex. Currently this is a no-op since RTCORBA::Mutex
* instances are destroyed as soon as their reference counts go to
* 0.
*/
- virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex);
/**
* Create a mutex and assign a name to it. If the
@@ -129,12 +123,10 @@ public:
* is set to 0.
*/
virtual RTCORBA::Mutex_ptr create_named_mutex (const char *name,
- CORBA::Boolean_out created_flag)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean_out created_flag);
/// Retrieve a previously created mutex.
- virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name)
- ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound));
+ virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name);
/**
* Create and return a TCPProtocolProperties instance with the specified
@@ -147,14 +139,12 @@ public:
CORBA::Boolean keep_alive,
CORBA::Boolean dont_route,
CORBA::Boolean no_delay,
- CORBA::Boolean enable_network_priority)
- ACE_THROW_SPEC ((CORBA::SystemException ));
+ CORBA::Boolean enable_network_priority);
RTCORBA::UnixDomainProtocolProperties_ptr
create_unix_domain_protocol_properties (
CORBA::Long send_buffer_size,
- CORBA::Long recv_buffer_size )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Long recv_buffer_size );
RTCORBA::SharedMemoryProtocolProperties_ptr
create_shared_memory_protocol_properties (
@@ -166,14 +156,12 @@ public:
CORBA::Long preallocate_buffer_size,
const char *mmap_filename,
const char *mmap_lockname
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ );
RTCORBA::UserDatagramProtocolProperties_ptr
create_user_datagram_protocol_properties (
CORBA::Boolean enable_network_priority
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ );
RTCORBA::StreamControlProtocolProperties_ptr
create_stream_control_protocol_properties (
@@ -183,8 +171,7 @@ public:
CORBA::Boolean dont_route,
CORBA::Boolean no_delay,
CORBA::Boolean enable_network_priority
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ );
/// Create a RTCORBA threadpool to manage a set of threads without lanes.
virtual RTCORBA::ThreadpoolId
@@ -195,8 +182,7 @@ public:
CORBA::Boolean allow_request_buffering,
CORBA::ULong max_buffered_requests,
CORBA::ULong max_request_buffer_size
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ );
/**
* Create a threadpool and separate it into subsets based on
@@ -209,27 +195,22 @@ public:
CORBA::Boolean allow_request_buffering,
CORBA::ULong max_buffered_requests,
CORBA::ULong max_request_buffer_size
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ );
/// Free the resources associated with the specified threadpool.
virtual void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- RTCORBA::RTORB::InvalidThreadpool));
+ );
/// Create a priority model policy for use when configuring a POA.
virtual RTCORBA::PriorityModelPolicy_ptr
create_priority_model_policy (
RTCORBA::PriorityModel priority_model,
RTCORBA::Priority server_priority
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ );
/// Create a ThreadpoolPolicy instance for POA creation
virtual RTCORBA::ThreadpoolPolicy_ptr
- create_threadpool_policy (RTCORBA::ThreadpoolId threadpool)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ create_threadpool_policy (RTCORBA::ThreadpoolId threadpool);
/**
* Create a PriorityBandedConnectionPolicy instance
@@ -237,8 +218,7 @@ public:
*/
virtual RTCORBA::PriorityBandedConnectionPolicy_ptr
create_priority_banded_connection_policy (const RTCORBA::PriorityBands &
- priority_bands)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ priority_bands);
/**
* Create a PrivateConnectionPolicy instance to use on client
@@ -246,24 +226,21 @@ public:
* to the server.
*/
virtual RTCORBA::PrivateConnectionPolicy_ptr
- create_private_connection_policy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ create_private_connection_policy (void);
/**
* Create a ServerProtocolPolicy instance to select and configure
* communication protocols on the server side.
*/
virtual RTCORBA::ServerProtocolPolicy_ptr
- create_server_protocol_policy (const RTCORBA::ProtocolList & protocols)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ create_server_protocol_policy (const RTCORBA::ProtocolList & protocols);
/**
* Create a ClientProtocolPolicy instance to select and configure
* communication protocols on the client side.
*/
virtual RTCORBA::ClientProtocolPolicy_ptr
- create_client_protocol_policy (const RTCORBA::ProtocolList & protocols)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ create_client_protocol_policy (const RTCORBA::ProtocolList & protocols);
/// Reference to our creating ORB Core.
TAO_ORB_Core *orb_core (void) const;
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index 1651d70f8a9..9eef8d09122 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -63,7 +63,6 @@ TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type,
void
TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
//
// Register all of the RT related services.
@@ -206,7 +205,6 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info)
void
TAO_RT_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->register_policy_factories (info);
}
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index 9a4cbe33ad2..adc676ef0de 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -65,11 +65,9 @@ public:
long scope_policy,
ACE_Time_Value const &dynamic_thread_idle_timeout);
- virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
- virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
private:
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
index a4ec2936b7c..91fc5db1537 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -17,8 +17,6 @@ CORBA::Policy_ptr
TAO_RT_PolicyFactory::create_policy (
CORBA::PolicyType type,
const CORBA::Any &value)
- ACE_THROW_SPEC ((CORBA::SystemException,
- CORBA::PolicyError))
{
if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
return TAO_PriorityModelPolicy::create (value);
@@ -42,11 +40,7 @@ TAO_RT_PolicyFactory::create_policy (
}
CORBA::Policy_ptr
-TAO_RT_PolicyFactory::_create_policy (
- CORBA::PolicyType type
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- CORBA::PolicyError))
+TAO_RT_PolicyFactory::_create_policy (CORBA::PolicyType type)
{
CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h
index d51b6ec34c8..99ca81ff1a6 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.h
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h
@@ -48,14 +48,10 @@ public:
CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
const CORBA::Any &value
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- CORBA::PolicyError));
+ );
CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- CORBA::PolicyError));
+ );
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index 2e7e82f7227..52fb0b3875b 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -9,6 +9,7 @@
#include "tao/debug.h"
#include "tao/CDR.h"
#include "tao/AnyTypeCode/Any.h"
+#include "tao/SystemException.h"
#include "ace/OS_NS_string.h"
@@ -73,28 +74,24 @@ TAO_PriorityModelPolicy::get_priority_model (void)
RTCORBA::PriorityModel
TAO_PriorityModelPolicy::priority_model (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->priority_model_;
}
RTCORBA::Priority
TAO_PriorityModelPolicy::server_priority (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->server_priority_;
}
CORBA::PolicyType
TAO_PriorityModelPolicy::policy_type (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return RTCORBA::PRIORITY_MODEL_POLICY_TYPE;
}
CORBA::Policy_ptr
TAO_PriorityModelPolicy::copy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_PriorityModelPolicy* tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -107,7 +104,6 @@ TAO_PriorityModelPolicy::copy (void)
void
TAO_PriorityModelPolicy::destroy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -190,21 +186,18 @@ TAO_ThreadpoolPolicy::create (const CORBA::Any &val
RTCORBA::ThreadpoolId
TAO_ThreadpoolPolicy::threadpool (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->id_;
}
CORBA::PolicyType
TAO_ThreadpoolPolicy::policy_type (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return RTCORBA::THREADPOOL_POLICY_TYPE;
}
CORBA::Policy_ptr
TAO_ThreadpoolPolicy::copy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_ThreadpoolPolicy* tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -217,7 +210,6 @@ TAO_ThreadpoolPolicy::copy (void)
void
TAO_ThreadpoolPolicy::destroy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -259,8 +251,7 @@ TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy (void)
}
CORBA::Policy_ptr
-TAO_PrivateConnectionPolicy::create (const CORBA::Any &
- )
+TAO_PrivateConnectionPolicy::create (const CORBA::Any &)
{
TAO_PrivateConnectionPolicy *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -273,14 +264,12 @@ TAO_PrivateConnectionPolicy::create (const CORBA::Any &
CORBA::PolicyType
TAO_PrivateConnectionPolicy::policy_type (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE;
}
CORBA::Policy_ptr
TAO_PrivateConnectionPolicy::copy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_PrivateConnectionPolicy* tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -293,7 +282,6 @@ TAO_PrivateConnectionPolicy::copy (void)
void
TAO_PrivateConnectionPolicy::destroy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -360,7 +348,6 @@ TAO_PriorityBandedConnectionPolicy::create (const CORBA::Any &val
RTCORBA::PriorityBands *
TAO_PriorityBandedConnectionPolicy::priority_bands (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
RTCORBA::PriorityBands *tmp;
ACE_NEW_THROW_EX (tmp,
@@ -373,14 +360,12 @@ TAO_PriorityBandedConnectionPolicy::priority_bands (void)
CORBA::PolicyType
TAO_PriorityBandedConnectionPolicy::policy_type (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
}
CORBA::Policy_ptr
TAO_PriorityBandedConnectionPolicy::copy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_PriorityBandedConnectionPolicy *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -393,7 +378,6 @@ TAO_PriorityBandedConnectionPolicy::copy (void)
void
TAO_PriorityBandedConnectionPolicy::destroy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -473,7 +457,6 @@ TAO_ServerProtocolPolicy::create (const CORBA::Any &val
RTCORBA::ProtocolList *
TAO_ServerProtocolPolicy::protocols (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
RTCORBA::ProtocolList *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -486,14 +469,12 @@ TAO_ServerProtocolPolicy::protocols (void)
CORBA::PolicyType
TAO_ServerProtocolPolicy::policy_type (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return RTCORBA::SERVER_PROTOCOL_POLICY_TYPE;
}
CORBA::Policy_ptr
TAO_ServerProtocolPolicy::copy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_ServerProtocolPolicy* tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -506,7 +487,6 @@ TAO_ServerProtocolPolicy::copy (void)
void
TAO_ServerProtocolPolicy::destroy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -579,7 +559,6 @@ TAO_ClientProtocolPolicy::create (const CORBA::Any &val
RTCORBA::ProtocolList *
TAO_ClientProtocolPolicy::protocols (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
RTCORBA::ProtocolList *tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -592,14 +571,12 @@ TAO_ClientProtocolPolicy::protocols (void)
CORBA::PolicyType
TAO_ClientProtocolPolicy::policy_type (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE;
}
CORBA::Policy_ptr
TAO_ClientProtocolPolicy::copy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_ClientProtocolPolicy* tmp = 0;
ACE_NEW_THROW_EX (tmp,
@@ -612,7 +589,6 @@ TAO_ClientProtocolPolicy::copy (void)
void
TAO_ClientProtocolPolicy::destroy (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -713,7 +689,6 @@ TAO_TCP_Protocol_Properties::~TAO_TCP_Protocol_Properties (void)
CORBA::Long
TAO_TCP_Protocol_Properties::send_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->send_buffer_size_;
}
@@ -721,14 +696,12 @@ TAO_TCP_Protocol_Properties::send_buffer_size (void)
void
TAO_TCP_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->send_buffer_size_ = send_buffer_size;
}
CORBA::Long
TAO_TCP_Protocol_Properties::recv_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->recv_buffer_size_;
}
@@ -736,14 +709,12 @@ TAO_TCP_Protocol_Properties::recv_buffer_size (void)
void
TAO_TCP_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->recv_buffer_size_ = recv_buffer_size;
}
CORBA::Boolean
TAO_TCP_Protocol_Properties::keep_alive (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->keep_alive_;
}
@@ -751,14 +722,12 @@ TAO_TCP_Protocol_Properties::keep_alive (void)
void
TAO_TCP_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->keep_alive_ = keep_alive;
}
CORBA::Boolean
TAO_TCP_Protocol_Properties::dont_route (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->dont_route_;
}
@@ -766,13 +735,11 @@ TAO_TCP_Protocol_Properties::dont_route (void)
void
TAO_TCP_Protocol_Properties::dont_route (CORBA::Boolean dont_route
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->dont_route_ = dont_route;
}
CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->no_delay_;
}
@@ -780,14 +747,12 @@ CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (void)
void
TAO_TCP_Protocol_Properties::no_delay (CORBA::Boolean no_delay
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->no_delay_ = no_delay;
}
CORBA::Boolean
TAO_TCP_Protocol_Properties::enable_network_priority (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->enable_network_priority_;
}
@@ -795,7 +760,6 @@ TAO_TCP_Protocol_Properties::enable_network_priority (void)
void
TAO_TCP_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->enable_network_priority_ = enable;
}
@@ -844,7 +808,6 @@ TAO_UnixDomain_Protocol_Properties::~TAO_UnixDomain_Protocol_Properties (void)
CORBA::Long
TAO_UnixDomain_Protocol_Properties::send_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->send_buffer_size_;
}
@@ -852,14 +815,12 @@ TAO_UnixDomain_Protocol_Properties::send_buffer_size (void)
void
TAO_UnixDomain_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->send_buffer_size_ = send_buffer_size;
}
CORBA::Long
TAO_UnixDomain_Protocol_Properties::recv_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->recv_buffer_size_;
}
@@ -867,7 +828,6 @@ TAO_UnixDomain_Protocol_Properties::recv_buffer_size (void)
void
TAO_UnixDomain_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->recv_buffer_size_ = recv_buffer_size;
}
@@ -914,7 +874,6 @@ TAO_SharedMemory_Protocol_Properties::~TAO_SharedMemory_Protocol_Properties (voi
CORBA::Long
TAO_SharedMemory_Protocol_Properties::send_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->send_buffer_size_;
}
@@ -922,14 +881,12 @@ TAO_SharedMemory_Protocol_Properties::send_buffer_size (void)
void
TAO_SharedMemory_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->send_buffer_size_ = send_buffer_size;
}
CORBA::Long
TAO_SharedMemory_Protocol_Properties::recv_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->recv_buffer_size_;
}
@@ -937,14 +894,12 @@ TAO_SharedMemory_Protocol_Properties::recv_buffer_size (void)
void
TAO_SharedMemory_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->recv_buffer_size_ = recv_buffer_size;
}
CORBA::Boolean
TAO_SharedMemory_Protocol_Properties::keep_alive (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->keep_alive_;
}
@@ -952,14 +907,12 @@ TAO_SharedMemory_Protocol_Properties::keep_alive (void)
void
TAO_SharedMemory_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->keep_alive_ = keep_alive;
}
CORBA::Boolean
TAO_SharedMemory_Protocol_Properties::dont_route (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->dont_route_;
}
@@ -967,14 +920,12 @@ TAO_SharedMemory_Protocol_Properties::dont_route (void)
void
TAO_SharedMemory_Protocol_Properties::dont_route (CORBA::Boolean dont_route
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->dont_route_ = dont_route;
}
CORBA::Boolean
TAO_SharedMemory_Protocol_Properties::no_delay (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->no_delay_;
}
@@ -982,14 +933,12 @@ TAO_SharedMemory_Protocol_Properties::no_delay (void)
void
TAO_SharedMemory_Protocol_Properties::no_delay (CORBA::Boolean no_delay
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->no_delay_ = no_delay;
}
CORBA::Long
TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->preallocate_buffer_size_;
}
@@ -997,14 +946,12 @@ TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (void)
void
TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->preallocate_buffer_size_ = preallocate_buffer_size;
}
char *
TAO_SharedMemory_Protocol_Properties::mmap_filename (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->mmap_filename_.rep ();
}
@@ -1012,14 +959,12 @@ TAO_SharedMemory_Protocol_Properties::mmap_filename (void)
void
TAO_SharedMemory_Protocol_Properties::mmap_filename (const char * mmap_filename
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->mmap_filename_.set (mmap_filename);
}
char *
TAO_SharedMemory_Protocol_Properties::mmap_lockname (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->mmap_lockname_.rep ();
}
@@ -1027,7 +972,6 @@ TAO_SharedMemory_Protocol_Properties::mmap_lockname (void)
void
TAO_SharedMemory_Protocol_Properties::mmap_lockname (const char * mmap_lockname
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->mmap_lockname_.set (mmap_lockname);
}
@@ -1085,7 +1029,6 @@ TAO_UserDatagram_Protocol_Properties::~TAO_UserDatagram_Protocol_Properties (voi
CORBA::Boolean
TAO_UserDatagram_Protocol_Properties::enable_network_priority (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->enable_network_priority_;
}
@@ -1093,7 +1036,6 @@ TAO_UserDatagram_Protocol_Properties::enable_network_priority (void)
void
TAO_UserDatagram_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->enable_network_priority_ = enable;
}
@@ -1133,7 +1075,6 @@ TAO_StreamControl_Protocol_Properties::~TAO_StreamControl_Protocol_Properties (v
CORBA::Long
TAO_StreamControl_Protocol_Properties::send_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->send_buffer_size_;
}
@@ -1141,14 +1082,12 @@ TAO_StreamControl_Protocol_Properties::send_buffer_size (void)
void
TAO_StreamControl_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->send_buffer_size_ = send_buffer_size;
}
CORBA::Long
TAO_StreamControl_Protocol_Properties::recv_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->recv_buffer_size_;
}
@@ -1156,14 +1095,12 @@ TAO_StreamControl_Protocol_Properties::recv_buffer_size (void)
void
TAO_StreamControl_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->recv_buffer_size_ = recv_buffer_size;
}
CORBA::Boolean
TAO_StreamControl_Protocol_Properties::keep_alive (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->keep_alive_;
}
@@ -1171,14 +1108,12 @@ TAO_StreamControl_Protocol_Properties::keep_alive (void)
void
TAO_StreamControl_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->keep_alive_ = keep_alive;
}
CORBA::Boolean
TAO_StreamControl_Protocol_Properties::dont_route (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->dont_route_;
}
@@ -1186,13 +1121,11 @@ TAO_StreamControl_Protocol_Properties::dont_route (void)
void
TAO_StreamControl_Protocol_Properties::dont_route (CORBA::Boolean dont_route
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->dont_route_ = dont_route;
}
CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->no_delay_;
}
@@ -1200,14 +1133,12 @@ CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (void)
void
TAO_StreamControl_Protocol_Properties::no_delay (CORBA::Boolean no_delay
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->no_delay_ = no_delay;
}
CORBA::Boolean
TAO_StreamControl_Protocol_Properties::enable_network_priority (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->enable_network_priority_;
}
@@ -1215,7 +1146,6 @@ TAO_StreamControl_Protocol_Properties::enable_network_priority (void)
void
TAO_StreamControl_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->enable_network_priority_ = enable;
}
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index 401eafaf4df..6893cb5fe6a 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -68,20 +68,15 @@ public:
*/
RTCORBA::PriorityModel get_priority_model (void);
- RTCORBA::PriorityModel priority_model (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ RTCORBA::PriorityModel priority_model (void);
- RTCORBA::Priority server_priority (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ RTCORBA::Priority server_priority (void);
- CORBA::PolicyType policy_type (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::PolicyType policy_type (void);
- CORBA::Policy_ptr copy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Policy_ptr copy (void);
- void destroy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void destroy (void);
/// This method writes a CDR representation of the object state.
CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -137,17 +132,13 @@ public:
/// Copy constructor.
TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs);
- RTCORBA::ThreadpoolId threadpool (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ RTCORBA::ThreadpoolId threadpool (void);
- CORBA::PolicyType policy_type (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::PolicyType policy_type (void);
- CORBA::Policy_ptr copy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Policy_ptr copy (void);
- void destroy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void destroy (void);
// Return the cached policy type for this policy.
TAO_Cached_Policy_Type _tao_cached_type (void) const;
@@ -193,14 +184,11 @@ public:
/// Copy constructor.
TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &rhs);
- CORBA::PolicyType policy_type (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::PolicyType policy_type (void);
- CORBA::Policy_ptr copy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Policy_ptr copy (void);
- void destroy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void destroy (void);
// Return the cached policy type for this policy.
TAO_Cached_Policy_Type _tao_cached_type (void) const;
@@ -251,17 +239,13 @@ public:
*/
RTCORBA::PriorityBands &priority_bands_rep (void);
- RTCORBA::PriorityBands *priority_bands (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ RTCORBA::PriorityBands *priority_bands (void);
- CORBA::PolicyType policy_type (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::PolicyType policy_type (void);
- CORBA::Policy_ptr copy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Policy_ptr copy (void);
- void destroy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void destroy (void);
/// This method writes a CDR representation of the current object.
CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -325,17 +309,13 @@ public:
RTCORBA::ProtocolList & protocols_rep (void);
RTCORBA::ProtocolList *protocols
- (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ (void);
- CORBA::PolicyType policy_type (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::PolicyType policy_type (void);
- CORBA::Policy_ptr copy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Policy_ptr copy (void);
- void destroy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void destroy (void);
// Return the cached policy type for this policy.
TAO_Cached_Policy_Type _tao_cached_type (void) const;
@@ -388,17 +368,13 @@ public:
RTCORBA::ProtocolList & protocols_rep (void);
RTCORBA::ProtocolList *protocols
- (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ (void);
- CORBA::PolicyType policy_type (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::PolicyType policy_type (void);
- CORBA::Policy_ptr copy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Policy_ptr copy (void);
- void destroy (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void destroy (void);
// = CDR Encoder/Decoder.
@@ -457,41 +433,29 @@ public:
CORBA::Boolean no_delay,
CORBA::Boolean enable_network_priority);
- CORBA::Long send_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Long send_buffer_size (void);
- void send_buffer_size (CORBA::Long send_buffer_size)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void send_buffer_size (CORBA::Long send_buffer_size);
- CORBA::Long recv_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Long recv_buffer_size (void);
- void recv_buffer_size (CORBA::Long recv_buffer_size)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void recv_buffer_size (CORBA::Long recv_buffer_size);
- CORBA::Boolean keep_alive (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean keep_alive (void);
- void keep_alive (CORBA::Boolean keep_alive)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void keep_alive (CORBA::Boolean keep_alive);
- CORBA::Boolean dont_route (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean dont_route (void);
- void dont_route (CORBA::Boolean dont_route)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void dont_route (CORBA::Boolean dont_route);
- CORBA::Boolean no_delay (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean no_delay (void);
- void no_delay (CORBA::Boolean no_delay)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void no_delay (CORBA::Boolean no_delay);
- CORBA::Boolean enable_network_priority (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean enable_network_priority (void);
- void enable_network_priority (CORBA::Boolean enable)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void enable_network_priority (CORBA::Boolean enable);
/// This method writes a CDR representation of TCPProtocolProperties.
CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -536,17 +500,13 @@ public:
TAO_UnixDomain_Protocol_Properties (CORBA::Long send_buffer_size,
CORBA::Long recv_buffer_size);
- CORBA::Long send_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Long send_buffer_size (void);
- void send_buffer_size (CORBA::Long send_buffer_size)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void send_buffer_size (CORBA::Long send_buffer_size);
- CORBA::Long recv_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Long recv_buffer_size (void);
- void recv_buffer_size (CORBA::Long recv_buffer_size)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void recv_buffer_size (CORBA::Long recv_buffer_size);
/**
* This method writes the CDR encapsulation of an instance of
@@ -607,57 +567,40 @@ public:
// = IDL interface methods.
- CORBA::Long send_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Long send_buffer_size (void);
- void send_buffer_size (CORBA::Long send_buffer_size)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void send_buffer_size (CORBA::Long send_buffer_size);
- CORBA::Long recv_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Long recv_buffer_size (void);
- void recv_buffer_size (CORBA::Long recv_buffer_size)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void recv_buffer_size (CORBA::Long recv_buffer_size);
- CORBA::Boolean keep_alive (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean keep_alive (void);
- void keep_alive (CORBA::Boolean keep_alive)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void keep_alive (CORBA::Boolean keep_alive);
- CORBA::Boolean dont_route (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean dont_route (void);
- void dont_route (CORBA::Boolean dont_route)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void dont_route (CORBA::Boolean dont_route);
- CORBA::Boolean no_delay (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean no_delay (void);
void no_delay (CORBA::Boolean no_delay
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ );
- CORBA::Boolean enable_network_priority (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean enable_network_priority (void);
- CORBA::Long preallocate_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Long preallocate_buffer_size (void);
- void preallocate_buffer_size (CORBA::Long preallocate_buffer_size)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void preallocate_buffer_size (CORBA::Long preallocate_buffer_size);
- char *mmap_filename (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ char *mmap_filename (void);
- void mmap_filename (const char *mmap_filename)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void mmap_filename (const char *mmap_filename);
- char *mmap_lockname (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ char *mmap_lockname (void);
- void mmap_lockname (const char *mmap_lockname)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void mmap_lockname (const char *mmap_lockname);
/**
* This method writes the CDR encapsulation of an instance of
@@ -713,11 +656,9 @@ public:
/// Constructor.
TAO_UserDatagram_Protocol_Properties (CORBA::Boolean enable_network_priority);
- CORBA::Boolean enable_network_priority (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean enable_network_priority (void);
- void enable_network_priority (CORBA::Boolean enable)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void enable_network_priority (CORBA::Boolean enable);
/// This method writes a CDR representation of UserDatagramProtocolProperties.
CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -759,41 +700,29 @@ public:
CORBA::Boolean no_delay,
CORBA::Boolean enable_network_priority);
- CORBA::Long send_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Long send_buffer_size (void);
- void send_buffer_size (CORBA::Long send_buffer_size)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void send_buffer_size (CORBA::Long send_buffer_size);
- CORBA::Long recv_buffer_size (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Long recv_buffer_size (void);
- void recv_buffer_size (CORBA::Long recv_buffer_size)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void recv_buffer_size (CORBA::Long recv_buffer_size);
- CORBA::Boolean keep_alive (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean keep_alive (void);
- void keep_alive (CORBA::Boolean keep_alive)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void keep_alive (CORBA::Boolean keep_alive);
- CORBA::Boolean dont_route (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean dont_route (void);
- void dont_route (CORBA::Boolean dont_route)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void dont_route (CORBA::Boolean dont_route);
- CORBA::Boolean no_delay (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean no_delay (void);
- void no_delay (CORBA::Boolean no_delay)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void no_delay (CORBA::Boolean no_delay);
- CORBA::Boolean enable_network_priority (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Boolean enable_network_priority (void);
- void enable_network_priority (CORBA::Boolean enable)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void enable_network_priority (CORBA::Boolean enable);
/// This method writes a CDR representation of StreamControlProtocolProperties.
CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index 139538e68d8..8cf78be0c6d 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -18,6 +18,7 @@
#include "tao/Policy_Set.h"
#include "tao/debug.h"
#include "tao/CDR.h"
+#include "tao/SystemException.h"
#include "ace/Dynamic_Service.h"
#include "ace/OS_NS_string.h"
@@ -70,8 +71,7 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core)
RTCORBA::ProtocolProperties_ptr
TAO_RT_Protocols_Hooks::server_protocol_properties (IOP::ProfileId protocol_tag,
- CORBA::Policy_ptr policy
- )
+ CORBA::Policy_ptr policy)
{
if (CORBA::is_nil (policy))
return 0;
@@ -176,8 +176,7 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_IIOP_Protocol_Propertie
)
{
RTCORBA::TCPProtocolProperties_var protocol_properties =
- RTCORBA::TCPProtocolProperties::_narrow (from
- );
+ RTCORBA::TCPProtocolProperties::_narrow (from);
to.send_buffer_size_ = protocol_properties->send_buffer_size ();
to.recv_buffer_size_ = protocol_properties->recv_buffer_size ();
@@ -188,8 +187,7 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_IIOP_Protocol_Propertie
}
void
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to
- )
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to)
{
RTCORBA::ProtocolProperties_var from =
this->server_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP);
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
index 84691dc0a24..ee410570711 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -8,7 +8,7 @@
#include "tao/ORB_Core.h"
#include "tao/Policy_Set.h"
#include "tao/Policy_Manager.h"
-
+#include "tao/SystemException.h"
ACE_RCSID (RTCORBA,
RT_Stub,
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index e7818d1917b..5a37a0282e9 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -715,7 +715,6 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
CORBA::ULong max_request_buffer_size,
ACE_Time_Value const &dynamic_thread_idle_timeout
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_THREAD_POOL_MANAGER_GUARD;
@@ -739,7 +738,6 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
CORBA::ULong max_request_buffer_size,
ACE_Time_Value const &dynamic_thread_idle_timeout
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_THREAD_POOL_MANAGER_GUARD;
@@ -749,15 +747,11 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
allow_request_buffering,
max_buffered_requests,
max_request_buffer_size,
- dynamic_thread_idle_timeout
- );
+ dynamic_thread_idle_timeout);
}
void
-TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- RTCORBA::RTORB::InvalidThreadpool))
+TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool)
{
TAO_Thread_Pool *tao_thread_pool = 0;
@@ -805,7 +799,6 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
CORBA::ULong max_request_buffer_size,
ACE_Time_Value const &dynamic_thread_idle_timeout
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// Create the thread pool.
TAO_Thread_Pool *thread_pool = 0;
@@ -837,7 +830,6 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
CORBA::ULong max_request_buffer_size,
ACE_Time_Value const &dynamic_thread_idle_timeout
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// Create the thread pool.
TAO_Thread_Pool *thread_pool = 0;
@@ -860,9 +852,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
}
RTCORBA::ThreadpoolId
-TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool
- )
- ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool)
{
// Make sure of safe deletion in case of errors.
auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool);
@@ -913,9 +903,7 @@ TAO_Thread_Pool_Manager::get_threadpool (RTCORBA::ThreadpoolId thread_pool_id )
TAO_THREAD_POOL_MANAGER_GUARD;
TAO_Thread_Pool *thread_pool = 0;
- int result =
- thread_pools_.find (thread_pool_id,
- thread_pool);
+ int const result = thread_pools_.find (thread_pool_id, thread_pool);
ACE_UNUSED_ARG (result);
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index f68dd67cd98..21009c2d2a4 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -383,8 +383,7 @@ public:
CORBA::Boolean allow_request_buffering,
CORBA::ULong max_buffered_requests,
CORBA::ULong max_request_buffer_size,
- ACE_Time_Value const &dynamic_thread_idle_timeout)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ ACE_Time_Value const &dynamic_thread_idle_timeout);
/// Create a threadpool with lanes.
RTCORBA::ThreadpoolId
@@ -395,14 +394,11 @@ public:
CORBA::ULong max_buffered_requests,
CORBA::ULong max_request_buffer_size,
ACE_Time_Value const &dynamic_thread_idle_timeout
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ );
/// Destroy a threadpool.
void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- RTCORBA::RTORB::InvalidThreadpool));
+ );
TAO_Thread_Pool *get_threadpool (RTCORBA::ThreadpoolId thread_pool_id);
@@ -429,8 +425,7 @@ private:
CORBA::Boolean allow_request_buffering,
CORBA::ULong max_buffered_requests,
CORBA::ULong max_request_buffer_size,
- ACE_Time_Value const &dynamic_thread_idle_timeout)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ ACE_Time_Value const &dynamic_thread_idle_timeout);
RTCORBA::ThreadpoolId
create_threadpool_with_lanes_i (CORBA::ULong stacksize,
@@ -440,12 +435,10 @@ private:
CORBA::ULong max_buffered_requests,
CORBA::ULong max_request_buffer_size,
ACE_Time_Value const &dynamic_thread_idle_timeout
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ );
RTCORBA::ThreadpoolId
- create_threadpool_helper (TAO_Thread_Pool *thread_pool)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ create_threadpool_helper (TAO_Thread_Pool *thread_pool);
// @}
View Lorry Controller Status