summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-01-24 18:50:00 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-01-24 18:50:00 +0000
commitf510bd609f3ca156e5913392345248183fc34aa5 (patch)
treef1493b56be20f29cc88fc2d095e68588ccb977a9
parent135d9801bb9295a5a00a8f1305a47834574c7f8d (diff)
downloadATCD-f510bd609f3ca156e5913392345248183fc34aa5.tar.gz
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl2
-rw-r--r--TAO/tao/ImR_Client/ImR_Client.cpp2
-rw-r--r--TAO/tao/PortableServer/Object_Adapter.cpp4
-rw-r--r--TAO/tao/PortableServer/Regular_POA.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp2
-rw-r--r--TAO/tao/PortableServer/Root_POA.cpp10
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp4
-rw-r--r--TAO/tao/PortableServer/Servant_Upcall.cpp2
11 files changed, 17 insertions, 17 deletions
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
index ca2810ee2ba..775d4a67719 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
@@ -47,7 +47,7 @@ TAO::CSD::TP_Servant_State_Map::insert(PortableServer::Servant servant
if (result == 1)
{
- throw (PortableServer::POA::ServantAlreadyActive ());
+ throw PortableServer::POA::ServantAlreadyActive ();
}
ACE_ASSERT (result == 0);
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index 219d69b69ae..e68b55b0e67 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -206,7 +206,7 @@ namespace TAO
if (!root_poa)
{
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
}
PortableServer::ObjectId_var id =
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 8b124ae693f..e1f999cffa0 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -425,7 +425,7 @@ TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
}
if (result != 0)
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
{
ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_FIND_POA_START);
@@ -1244,7 +1244,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void)
int result =
this->non_servant_upcall_condition_.wait ();
if (result == -1)
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
}
}
diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp
index 07a1f569f4b..ccbeb31f204 100644
--- a/TAO/tao/PortableServer/Regular_POA.cpp
+++ b/TAO/tao/PortableServer/Regular_POA.cpp
@@ -46,7 +46,7 @@ TAO_Regular_POA::remove_from_parent_i (void)
int result = this->parent_->delete_child (this->name_);
if (result != 0)
{
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
}
}
}
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
index 58d458e1442..3becbba1b37 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -143,7 +143,7 @@ namespace TAO
if (result != 0)
{
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
}
}
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index 84f63fc75ab..d28ded5325d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -224,7 +224,7 @@ namespace TAO
if (result != 0)
{
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
}
}
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
index 68b0fd5b809..3eaa2010b83 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -321,7 +321,7 @@ namespace TAO
int result = this->poa_->unbind_using_user_id (user_id);
if (result != 0)
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
}
void
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
index 1751bfab044..fbe9bb76c94 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -204,7 +204,7 @@ namespace TAO
if (result != 0)
{
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
}
}
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index c827778e59b..c54ad313b78 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -272,7 +272,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
int result = this->poa_manager_.register_poa (this);
if (result != 0)
{
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
}
// Add self to Object Adapter class.
@@ -286,7 +286,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
// further errors...
this->poa_manager_.remove_poa (this);
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
}
// Set the id for this POA.
@@ -322,14 +322,14 @@ TAO_Root_POA::complete_destruction_i (void)
int result = this->poa_manager_.remove_poa (this);
if (result != 0)
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
// Remove POA from the Object Adapter.
result = this->object_adapter ().unbind_poa (this,
this->folded_name_,
this->system_name_.in ());
if (result != 0)
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
// Cleanup all strategies
this->active_policy_strategies_.cleanup ();
@@ -1232,7 +1232,7 @@ TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion)
int result = this->outstanding_requests_condition_.wait ();
if (result == -1)
{
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
}
}
}
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index f744d954072..8d59564e422 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -900,7 +900,7 @@ namespace TAO
}
else
{
- throw (PortableServer::POA::ServantAlreadyActive ());
+ throw PortableServer::POA::ServantAlreadyActive ();
}
}
@@ -911,7 +911,7 @@ namespace TAO
id,
priority) != 0)
{
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
}
//
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index fa8097c116e..615edc27976 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -344,7 +344,7 @@ namespace TAO
if (result == -1)
// Locking error.
- throw ( ::CORBA::OBJ_ADAPTER ());
+ throw ::CORBA::OBJ_ADAPTER ();
#endif /* !TAO_HAS_MINIMUM_POA == 0 */
}