summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp4
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp4
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp4
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp8
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp25
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp16
-rw-r--r--TAO/orbsvcs/tests/Trading/TT_Info.cpp4
-rw-r--r--TAO/performance-tests/Anyop/anyop.cpp16
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp2
-rw-r--r--TAO/tests/Any/Recursive/client.cpp2
-rw-r--r--TAO/tests/Bug_2678_Regression/client.cpp4
-rw-r--r--TAO/tests/Bug_2678_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2804_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2844_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2918_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3506_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3552_Regression/check.cpp2
-rw-r--r--TAO/tests/Bug_3919_Regression/client.cpp2
-rw-r--r--TAO/tests/Codec/client.cpp2
-rw-r--r--TAO/tests/DynAny_Test/test_dynany.cpp2
-rw-r--r--TAO/tests/DynAny_Test/test_dynsequence.cpp2
-rw-r--r--TAO/tests/DynAny_Test/test_dynstruct.cpp2
-rw-r--r--TAO/tests/Param_Test/any.cpp16
-rw-r--r--TAO/tests/Param_Test/anyop.cpp4
-rw-r--r--TAO/tests/Param_Test/bd_array_seq.cpp2
-rw-r--r--TAO/tests/Param_Test/bd_short_seq.cpp2
-rw-r--r--TAO/tests/Param_Test/bd_struct_seq.cpp2
-rw-r--r--TAO/tests/Param_Test/big_union.cpp2
-rw-r--r--TAO/tests/Param_Test/complex_any.cpp4
-rw-r--r--TAO/tests/Param_Test/except.cpp4
-rw-r--r--TAO/tests/Param_Test/fixed_struct.cpp2
-rw-r--r--TAO/tests/Param_Test/nested_struct.cpp2
-rw-r--r--TAO/tests/Param_Test/objref_struct.cpp2
-rw-r--r--TAO/tests/Param_Test/recursive_struct.cpp2
-rw-r--r--TAO/tests/Param_Test/recursive_union.cpp2
-rw-r--r--TAO/tests/Param_Test/small_union.cpp2
-rw-r--r--TAO/tests/Param_Test/ub_any_seq.cpp2
-rw-r--r--TAO/tests/Param_Test/ub_array_seq.cpp2
-rw-r--r--TAO/tests/Param_Test/ub_long_seq.cpp2
-rw-r--r--TAO/tests/Param_Test/ub_objref_seq.cpp2
-rw-r--r--TAO/tests/Param_Test/ub_short_seq.cpp2
-rw-r--r--TAO/tests/Param_Test/ub_str_seq.cpp2
-rw-r--r--TAO/tests/Param_Test/ub_struct_seq.cpp2
-rw-r--r--TAO/tests/Param_Test/ub_wstr_seq.cpp2
-rw-r--r--TAO/tests/Param_Test/var_struct.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp4
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp4
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp2
56 files changed, 103 insertions, 108 deletions
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
index 89ba45f3008..337409350ee 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
@@ -30,7 +30,7 @@ Stock_Consumer::disconnect ()
void
Stock_Consumer::push (const CORBA::Any& data)
{
- Quoter::Event *event;
+ const Quoter::Event *event = 0;
if ((data >>= event) == 0)
return; // Invalid event
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index 90e2bf12b08..58382e590b9 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -331,7 +331,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
CORBA::Policy_out sched_param_out,
CORBA::Policy_out /*implicit_sched_param_out*/)
{
- Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
+ const Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr = 0;
#ifdef KOKYU_DSRT_LOGGING
ACE_DEBUG ((LM_DEBUG, "(%t|%T):entered FP_Scheduler::receive_request\n"));
@@ -531,7 +531,7 @@ Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_
//Don't store in a _var, since >>= returns a pointer to an internal buffer
//and we are not supposed to free it.
- Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
+ const Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr = 0;
CORBA::Any sc_qos_as_any;
CORBA::Any_var scqostmp = codec_->decode (oc_seq);
sc_qos_as_any = scqostmp.in ();
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index a729100171d..7ef371fe041 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -326,7 +326,7 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
CORBA::Policy_out sched_param_out,
CORBA::Policy_out /*implicit_sched_param_out*/)
{
- Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
+ const Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr = 0;
#ifdef KOKYU_DSRT_LOGGING
ACE_DEBUG ((LM_DEBUG, "(%t|%T):entered MIF_Scheduler::receive_request\n"));
@@ -530,7 +530,7 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
//Don't store in a _var, since >>= returns a pointer to an internal buffer
//and we are not supposed to free it.
- Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
+ const Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr = 0;
CORBA::Any sc_qos_as_any;
CORBA::Any_var scqostmp = codec_->decode (oc_seq);
sc_qos_as_any = scqostmp.in ();
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index 02c9e4ffb27..94a2d5affd5 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -340,7 +340,7 @@ MUF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
CORBA::Policy_out sched_param_out,
CORBA::Policy_out /*implicit_sched_param_out*/)
{
- Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
+ const Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr = 0;
#ifdef KOKYU_DSRT_LOGGING
ACE_DEBUG ((LM_DEBUG, "(%t|%T):entered MUF_Scheduler::receive_request\n"));
@@ -575,7 +575,7 @@ MUF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
//Don't store in a _var, since >>= returns a pointer to an internal buffer
//and we are not supposed to free it.
- Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
+ const Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr = 0;
CORBA::Any sc_qos_as_any;
CORBA::Any_var scqostmp = codec_->decode (oc_seq);
sc_qos_as_any = scqostmp.in ();
diff --git a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp
index 1832c0e368d..b0c7a59fe9c 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp
@@ -44,7 +44,7 @@ ATC_Test_i::~ATC_Test_i (void)
char *
ATC_Test_i::do_union (const ::CORBA::Any & a)
{
- Demo::NestedUnion *any_union;
+ const Demo::NestedUnion *any_union = 0;
const char *result = "do_union called";
if (a >>= any_union)
{
@@ -104,7 +104,7 @@ ATC_Test_i::do_union (const ::CORBA::Any & a)
char *
ATC_Test_i::do_struct (const ::CORBA::Any & a)
{
- Demo::NestedStruct *bar;
+ const Demo::NestedStruct *bar = 0;
const char *result = "do_struct called";
if (a >>= bar)
{
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index b82e476c630..78f2d4b59b7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -925,7 +925,7 @@ TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props)
else if (property.nam == this->built_in_balancing_strategy_info_name_)
{
- CosLoadBalancing::StrategyInfo * info;
+ const CosLoadBalancing::StrategyInfo * info = 0;
if (property.val >>= info)
{
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
index 9e41c5915ba..4c11746bffd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
@@ -94,7 +94,7 @@ TAO_PG_Default_Property_Validator::validate_criteria (
}
else if (property.nam == this->factories_)
{
- PortableGroup::FactoriesValue * factories;
+ copnst PortableGroup::FactoriesValue * factories = 0;
if (!(property.val >>= factories))
invalid_criteria[p++] = property;
else
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index 05984766838..23fb3ea2a71 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -128,7 +128,7 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list)
{
this->check_validity ();
- ::SSLIOP::AuthData *data = 0;
+ const ::SSLIOP::AuthData *data = 0;
if (!(this->acquisition_arguments_ >>= data))
throw CORBA::BAD_PARAM ();
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
index 2bdacf03186..cc1f51d063e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
@@ -12,7 +12,7 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
if (type == SecurityLevel3::ContextEstablishmentPolicyType)
{
- SecurityLevel3::ContextEstablishmentPolicyArgument * arg = 0;
+ const SecurityLevel3::ContextEstablishmentPolicyArgument * arg = 0;
if (!(value >>= arg))
throw CORBA::INTERNAL ();
@@ -28,7 +28,7 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
}
else if (type == SecurityLevel3::ObjectCredentialsPolicyType)
{
- SecurityLevel3::ObjectCredentialsPolicyArgument * creds = 0;
+ const SecurityLevel3::ObjectCredentialsPolicyArgument * creds = 0;
if (!(value >>= creds))
throw CORBA::INTERNAL ();
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index d377562f262..b8610481fcc 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -49,7 +49,7 @@ TAO::Security::PolicyFactory::create_policy (
else if (type == ::Security::SecEstablishTrustPolicy)
{
- ::Security::EstablishTrust *trust = 0;
+ const ::Security::EstablishTrust *trust = 0;
// Extract the desired establishing of trust value from the
// given Any.
@@ -74,7 +74,7 @@ TAO::Security::PolicyFactory::create_policy (
else if (type == SecurityLevel3::ContextEstablishmentPolicyType)
{
- SecurityLevel3::ContextEstablishmentPolicyArgument * args = 0;
+ const SecurityLevel3::ContextEstablishmentPolicyArgument * args = 0;
// Extract the desired establishing of trust value from the
// given Any.
@@ -105,7 +105,7 @@ TAO::Security::PolicyFactory::create_policy (
else if (type == SecurityLevel3::ObjectCredentialsPolicyType)
{
- SecurityLevel3::OwnCredentialsList * creds = 0;
+ const SecurityLevel3::OwnCredentialsList * creds = 0;
// Extract the desired establishing of trust value from the
// given Any.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index c6c8a5bac55..6b140767f01 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -263,7 +263,7 @@ TAO_Property_Evaluator::property_value (int index)
else if (this->supports_dp_)
{
// Property is defined at this point.
- CosTradingDynamic::DynamicProp* dp_struct;
+ const CosTradingDynamic::DynamicProp* dp_struct = 0;
const CORBA::String_var name = this->props_[index].name.in ();
const CORBA::Any& value = this->props_[index].value;
@@ -314,7 +314,7 @@ TAO_Property_Evaluator::property_type (int index)
{
// Extract type information from the DP_Struct.
const CORBA::Any& value = this->props_[index].value;
- CosTradingDynamic::DynamicProp* dp_struct = 0;
+ const CosTradingDynamic::DynamicProp* dp_struct = 0;
value >>= dp_struct;
// Grab a pointer to the returned_type description
@@ -706,7 +706,7 @@ TAO_Policies::exact_type_match (void) const
CosTrading::TraderName*
TAO_Policies::starting_trader (void) const
{
- CosTrading::TraderName* trader_name = 0;
+ const CosTrading::TraderName* trader_name = 0;
if (this->policies_[STARTING_TRADER] != 0)
{
@@ -791,7 +791,7 @@ TAO_Policies::hop_count (void) const
CosTrading::Admin::OctetSeq*
TAO_Policies::request_id (void) const
{
- CosTrading::Admin::OctetSeq* request_id = 0;
+ const CosTrading::Admin::OctetSeq* request_id = 0;
if (this->policies_[REQUEST_ID] != 0)
{
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index eab7f237b54..87df88547bb 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -555,7 +555,7 @@ IDL3_Client::home_test (void)
CORBA::Contained::Description_var desc =
home->describe ();
- CORBA::ComponentIR::HomeDescription *home_desc = 0;
+ const CORBA::ComponentIR::HomeDescription *home_desc = 0;
if ((desc->value >>= home_desc) == 0)
{
@@ -654,8 +654,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
return -1;
}
- status = this->valuetype_factory_test (desc,
- prefix);
+ status = this->valuetype_factory_test (desc, prefix);
if (status != 0)
{
@@ -667,8 +666,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
int
IDL3_Client::component_attribute_test (
- CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &desc
- )
+ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &desc)
{
if (desc->attributes.length () != ATTRS_LEN)
{
@@ -750,8 +748,7 @@ IDL3_Client::component_attribute_test (
int
IDL3_Client::component_inheritance_test (
- CORBA::ComponentIR::ComponentDef_var &comp_def
- )
+ CORBA::ComponentIR::ComponentDef_var &comp_def)
{
CORBA::ComponentIR::ComponentDef_var comp_base =
comp_def->base_component ();
@@ -823,13 +820,12 @@ IDL3_Client::component_inheritance_test (
int
IDL3_Client::component_port_test (
- CORBA::ComponentIR::ComponentDef_var &comp_def
- )
+ CORBA::ComponentIR::ComponentDef_var &comp_def)
{
CORBA::Contained::Description_var desc =
comp_def->describe ();
- CORBA::ComponentIR::ComponentDescription *cd = 0;
+ const CORBA::ComponentIR::ComponentDescription *cd = 0;
if ((desc->value >>= cd) == 0)
{
@@ -1153,8 +1149,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
int
IDL3_Client::valuetype_attribute_test (
CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
- const char *prefix
- )
+ const char *prefix)
{
if (desc->attributes.length () != ATTRS_LEN)
{
@@ -1358,8 +1353,7 @@ IDL3_Client::valuetype_operation_test (
int
IDL3_Client::valuetype_member_test (
CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
- const char *prefix
- )
+ const char *prefix)
{
CORBA::ULong length = desc->members.length ();
@@ -1417,8 +1411,7 @@ IDL3_Client::valuetype_member_test (
int
IDL3_Client::valuetype_factory_test (
CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
- const char *prefix
- )
+ const char *prefix)
{
CORBA::ULong length = desc->initializers.length ();
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index 6c462bea6fa..f518158d272 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -403,7 +403,7 @@ Admin_Client::enum_test (void)
ACE_TEST_ASSERT (dkind == CORBA::dk_Enum);
- CORBA::TypeDescription *td;
+ const CORBA::TypeDescription *td = 0;
desc->value >>= td;
if (this->debug_)
@@ -744,7 +744,7 @@ Admin_Client::alias_test (void)
CORBA::Contained::Description_var desc =
a_var->describe ();
- CORBA::TypeDescription *td;
+ const CORBA::TypeDescription *td = 0;
desc->value >>= td;
if (this->debug_)
@@ -972,7 +972,7 @@ Admin_Client::struct_test (void)
CORBA::Contained::Description_var desc =
svar->describe ();
- CORBA::TypeDescription *td;
+ const CORBA::TypeDescription *td = 0;
desc->value >>= td;
if (this->debug_)
@@ -1209,7 +1209,7 @@ Admin_Client::struct_test (void)
for (i = 0; i < length; ++i)
{
- CORBA::TypeDescription *td;
+ const CORBA::TypeDescription *td = 0;
cont_desc[i].value >>= td;
str = td->type->id ();
@@ -1573,7 +1573,7 @@ Admin_Client::exception_test (void)
CORBA::Contained::Description_var desc =
exvar->describe ();
- CORBA::ExceptionDescription *ed;
+ const CORBA::ExceptionDescription *ed = 0;
desc->value >>= ed;
if (this->debug_)
@@ -1830,7 +1830,7 @@ Admin_Client::exception_test (void)
ACE_TEST_ASSERT (length == 2);
- CORBA::TypeDescription *td;
+ const CORBA::TypeDescription *td = 0;
for (i = 0; i < length; ++i)
{
@@ -2216,7 +2216,7 @@ Admin_Client::interface_test (void)
CORBA::Contained::Description_var desc =
p_op->describe ();
- CORBA::OperationDescription *od;
+ const CORBA::OperationDescription *od = 0;
desc->value >>= od;
if (this->debug_)
@@ -2421,7 +2421,7 @@ Admin_Client::interface_test (void)
desc = ivar->describe ();
- CORBA::InterfaceDescription *ifd;
+ const CORBA::InterfaceDescription *ifd = 0;
desc->value >>= ifd;
length = ifd->base_interfaces.length ();
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index ddc26953dba..329f3d8c86a 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -178,7 +178,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
if (check)
{
- TAO_Trader_Test::StringSeq* str_seq;
+ const TAO_Trader_Test::StringSeq* str_seq = 0;
(*value) >>= str_seq;
for (seq_length = str_seq->length (), i = 0; i < seq_length; i++)
@@ -192,7 +192,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
if (check)
{
- TAO_Trader_Test::ULongSeq* ulong_seq;
+ const TAO_Trader_Test::ULongSeq* ulong_seq = 0;
(*value) >>= ulong_seq;
for (seq_length = ulong_seq->length (), i = 0; i < seq_length; i++)
diff --git a/TAO/performance-tests/Anyop/anyop.cpp b/TAO/performance-tests/Anyop/anyop.cpp
index 58725a011ac..d7f0420654f 100644
--- a/TAO/performance-tests/Anyop/anyop.cpp
+++ b/TAO/performance-tests/Anyop/anyop.cpp
@@ -383,7 +383,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_hrtime_t now = ACE_OS::gethrtime ();
history.sample (now - start);
- Param_Test::Fixed_Struct *o;
+ const Param_Test::Fixed_Struct *o = 0;
result = any >>= o;
}
@@ -391,7 +391,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
any <<= i;
- Param_Test::Fixed_Struct *o;
+ const Param_Test::Fixed_Struct *o = 0;
ACE_hrtime_t start = ACE_OS::gethrtime ();
@@ -461,7 +461,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_hrtime_t now = ACE_OS::gethrtime ();
history.sample (now - start);
- Param_Test::Fixed_Struct *o;
+ const Param_Test::Fixed_Struct *o = 0;
result = any >>= o;
}
@@ -469,7 +469,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
any <<= i;
- Param_Test::Fixed_Struct *o;
+ const Param_Test::Fixed_Struct *o = 0;
ACE_hrtime_t start = ACE_OS::gethrtime ();
@@ -538,7 +538,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_hrtime_t now = ACE_OS::gethrtime ();
history.sample (now - start);
- Param_Test::Long_Seq *o;
+ const Param_Test::Long_Seq *o = 0;
result = any >>= o;
}
@@ -546,7 +546,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
any <<= i;
- Param_Test::Long_Seq *o;
+ const Param_Test::Long_Seq *o = 0;
ACE_hrtime_t start = ACE_OS::gethrtime ();
@@ -616,7 +616,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_hrtime_t now = ACE_OS::gethrtime ();
history.sample (now - start);
- Param_Test::Long_Seq *o;
+ const Param_Test::Long_Seq *o = 0;
result = any >>= o;
}
@@ -624,7 +624,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
any <<= i;
- Param_Test::Long_Seq *o;
+ const Param_Test::Long_Seq *o = 0;
ACE_hrtime_t start = ACE_OS::gethrtime ();
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index 3769351bdb3..c64c7a5b63a 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -1064,7 +1064,7 @@ Cubit_Client::cube_any_struct (int i)
try
{
Cubit::Many arg_struct;
- Cubit::Many * ret_struct;
+ const Cubit::Many * ret_struct = 0;
this->call_count_++;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index 265d0114025..80f56b7c9f8 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -393,7 +393,7 @@ CORBA::Any *
Cubit_i::cube_any_struct (const CORBA::Any & any)
{
ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_STRUCT_START);
- Cubit::Many * arg_struct;
+ const Cubit::Many * arg_struct = 0;
Cubit::Many ret_struct;
any >>= arg_struct;
diff --git a/TAO/tests/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp
index ca2d84d4a23..142d5ac6e53 100644
--- a/TAO/tests/Any/Recursive/client.cpp
+++ b/TAO/tests/Any/Recursive/client.cpp
@@ -112,7 +112,7 @@ perform_invocation (Test::Hello_ptr hello,
CORBA::Any_var my_any =
hello->get_any (the_any);
- T * my_foo = 0;
+ const T * my_foo = 0;
if (!(my_any.in () >>= my_foo))
throw Test::Demarshaling_From_Any_Failed ();
diff --git a/TAO/tests/Bug_2678_Regression/client.cpp b/TAO/tests/Bug_2678_Regression/client.cpp
index 6e054852575..d8d41517a27 100644
--- a/TAO/tests/Bug_2678_Regression/client.cpp
+++ b/TAO/tests/Bug_2678_Regression/client.cpp
@@ -67,14 +67,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
for (CORBA::ULong count = 0; count < params->length(); ++count)
{
- Container* container = 0;
+ const Container* container = 0;
if (!(params[count] >>= container))
{
ACE_ERROR ((LM_ERROR, "ERROR, failed extract\n"));
}
else
{
- Inner* inner = 0;
+ const Inner* inner = 0;
if (!(container->contents >>= inner))
{
ACE_ERROR ((LM_ERROR, "ERROR, failed extract\n"));
diff --git a/TAO/tests/Bug_2678_Regression/server.cpp b/TAO/tests/Bug_2678_Regression/server.cpp
index 831a0c643b5..acc58355ae4 100644
--- a/TAO/tests/Bug_2678_Regression/server.cpp
+++ b/TAO/tests/Bug_2678_Regression/server.cpp
@@ -37,7 +37,7 @@ AnySeq *Test_impl::RunTest(const AnySeq &params)
}
else
{
- Inner* inner = 0;
+ const Inner* inner = 0;
if (!(container->contents >>= inner))
{
ACE_ERROR ((LM_ERROR, "ERROR, failed extract\n"));
diff --git a/TAO/tests/Bug_2804_Regression/client.cpp b/TAO/tests/Bug_2804_Regression/client.cpp
index 17bfc4b33e1..9cdf85c1e6f 100644
--- a/TAO/tests/Bug_2804_Regression/client.cpp
+++ b/TAO/tests/Bug_2804_Regression/client.cpp
@@ -51,7 +51,7 @@ perform_invocation (Test::Hello_ptr hello,
CORBA::Any_var my_any =
hello->get_any (the_any);
- T * my_foo = 0;
+ const T * my_foo = 0;
if (!(my_any.in () >>= my_foo))
throw Test::Demarshaling_From_Any_Failed ();
diff --git a/TAO/tests/Bug_2844_Regression/client.cpp b/TAO/tests/Bug_2844_Regression/client.cpp
index 831bf9b524c..f845a6894e5 100644
--- a/TAO/tests/Bug_2844_Regression/client.cpp
+++ b/TAO/tests/Bug_2844_Regression/client.cpp
@@ -51,7 +51,7 @@ perform_invocation (Test::Hello_ptr hello,
CORBA::Any_var my_any =
hello->get_any (the_any);
- T * my_foo = 0;
+ const T * my_foo = 0;
if (!(my_any.in () >>= my_foo))
throw Test::Demarshaling_From_Any_Failed ();
diff --git a/TAO/tests/Bug_2918_Regression/client.cpp b/TAO/tests/Bug_2918_Regression/client.cpp
index 537634be028..14f608c2f68 100644
--- a/TAO/tests/Bug_2918_Regression/client.cpp
+++ b/TAO/tests/Bug_2918_Regression/client.cpp
@@ -50,7 +50,7 @@ perform_invocation (Test::Hello_ptr hello,
CORBA::Any_var my_any =
hello->get_any (the_any);
- T * my_foo = 0;
+ const T * my_foo = 0;
if (!(my_any.in () >>= my_foo))
throw Test::Demarshaling_From_Any_Failed ();
diff --git a/TAO/tests/Bug_3506_Regression/server.cpp b/TAO/tests/Bug_3506_Regression/server.cpp
index 7dc4dff44c9..7ca7b21c08a 100644
--- a/TAO/tests/Bug_3506_Regression/server.cpp
+++ b/TAO/tests/Bug_3506_Regression/server.cpp
@@ -45,7 +45,7 @@ public:
virtual void
foo (const ::IF_EXE_M_R::Test_Struct &ts)
{
- IF_EXE_M_R::CORBA_FOOIInPlan *anUnion_p = new IF_EXE_M_R::CORBA_FOOIInPlan;
+ const IF_EXE_M_R::CORBA_FOOIInPlan *anUnion_p = new IF_EXE_M_R::CORBA_FOOIInPlan;
if (ts.whatEver >>= anUnion_p)
{
ACE_DEBUG((LM_DEBUG, "Any successfully marshalled\nAny is %@\nID: %C\nNAME: %C\nKIND: %d\n", &ts.whatEver,
diff --git a/TAO/tests/Bug_3552_Regression/check.cpp b/TAO/tests/Bug_3552_Regression/check.cpp
index 2dbd38dfdb8..d6b205dd0de 100644
--- a/TAO/tests/Bug_3552_Regression/check.cpp
+++ b/TAO/tests/Bug_3552_Regression/check.cpp
@@ -67,7 +67,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
CORBA::Any_var
decodedData = codec->decode (OctSeq);
// And extract the actual struct (still owned by the any)
- Test::theStruct *myStruct;
+ const Test::theStruct *myStruct = 0;
if (decodedData.in () >>= myStruct)
{
if (!strcmp (myStruct->theString, "Hello"))
diff --git a/TAO/tests/Bug_3919_Regression/client.cpp b/TAO/tests/Bug_3919_Regression/client.cpp
index 2fe749eea90..c618a9c16f3 100644
--- a/TAO/tests/Bug_3919_Regression/client.cpp
+++ b/TAO/tests/Bug_3919_Regression/client.cpp
@@ -51,7 +51,7 @@ perform_invocation (Test::Hello_ptr hello,
CORBA::Any_var my_any =
hello->get_any (the_any);
- T * my_foo = 0;
+ const T * my_foo = 0;
if (!(my_any.in () >>= my_foo))
throw Test::Demarshaling_From_Any_Failed ();
diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp
index c675031b0c2..70843f8f8d0 100644
--- a/TAO/tests/Codec/client.cpp
+++ b/TAO/tests/Codec/client.cpp
@@ -95,7 +95,7 @@ test_codec (IOP::Codec_ptr codec)
CORBA::OctetSeq_var encoded_data;
CORBA::Any_var decoded_data;
- Foo::Bar *extracted_value = 0;
+ const Foo::Bar *extracted_value = 0;
// Encode the structure into an octet sequence using the CDR
// enscapsulation Codec.
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index 5f68a153d78..1bc74d3fe5a 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -304,7 +304,7 @@ Test_DynAny::run_test (void)
analyzer.analyze (ftc3.in ());
CORBA::Any_var out_any3 = ftc3->to_any ();
- CORBA::ShortSeq *outseq = 0;
+ const CORBA::ShortSeq *outseq = 0;
out_any3.in () >>= outseq;
good =
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 44fe649c474..3af5b0f5e85 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -311,7 +311,7 @@ Test_DynSequence::run_test (void)
CORBA::Any_var out_any1 =
ftc1->to_any ();
- DynAnyTests::test_seq *ts_out;
+ const DynAnyTests::test_seq *ts_out = 0;
out_any1.in () >>= ts_out;
if (!ACE_OS::strcmp ((*ts_out)[0U], data.m_string1))
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index d506d254489..3ef81705613 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -183,7 +183,7 @@ Test_DynStruct::run_test (void)
CORBA::Any_var out_any1 =
ftc1->to_any ();
- DynAnyTests::test_struct* ts_out;
+ const DynAnyTests::test_struct* ts_out = 0;
out_any1.in () >>= ts_out;
if (ts_out->es.s == data.m_short1)
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp
index 5c18bfea459..3500f89a4a7 100644
--- a/TAO/tests/Param_Test/any.cpp
+++ b/TAO/tests/Param_Test/any.cpp
@@ -215,7 +215,8 @@ Test_Any::reset_parameters (void)
if (TAO_debug_level > 0)
{
- Param_Test::Big_Union *bu_in, *bu_inout;
+ const Param_Test::Big_Union *bu_in = 0;
+ const Param_Test::Big_Union *bu_inout = 0;
this->in_ >>= bu_in;
this->inout_ >>= bu_inout;
ACE_DEBUG ((LM_DEBUG,
@@ -238,7 +239,8 @@ Test_Any::reset_parameters (void)
if (TAO_debug_level > 0)
{
- Param_Test::Small_Union *bu_in, *bu_inout;
+ const Param_Test::Small_Union *bu_in = 0;
+ const Param_Test::Small_Union *bu_inout = 0;
this->in_ >>= bu_in;
this->inout_ >>= bu_inout;
ACE_DEBUG ((LM_DEBUG,
@@ -280,11 +282,11 @@ Test_Any::check_validity (void)
const char *str_ret;
Coffee_ptr obj_in, obj_inout, obj_out, obj_ret;
Param_Test::Fixed_Array_forany array_in, array_inout, array_out, array_ret;
- Param_Test::Bounded_Short_Seq *bdss_in, *bdss_inout, *bdss_out, *bdss_ret;
- CORBA::ShortSeq *ubss_in, *ubss_inout, *ubss_out, *ubss_ret;
- Param_Test::Fixed_Struct *fs_in, *fs_inout, *fs_out, *fs_ret;
- Param_Test::Big_Union *bu_in, *bu_inout, *bu_out, *bu_ret;
- Param_Test::Small_Union *su_in, *su_inout, *su_out, *su_ret;
+ const Param_Test::Bounded_Short_Seq *bdss_in, *bdss_inout, *bdss_out, *bdss_ret;
+ const CORBA::ShortSeq *ubss_in, *ubss_inout, *ubss_out, *ubss_ret;
+ const Param_Test::Fixed_Struct *fs_in, *fs_inout, *fs_out, *fs_ret;
+ const Param_Test::Big_Union *bu_in, *bu_inout, *bu_out, *bu_ret;
+ const Param_Test::Small_Union *su_in, *su_inout, *su_out, *su_ret;
if ((this->in_ >>= short_in) &&
(this->inout_ >>= short_inout) &&
diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp
index 443a9ee7a2f..fc41d35ef63 100644
--- a/TAO/tests/Param_Test/anyop.cpp
+++ b/TAO/tests/Param_Test/anyop.cpp
@@ -240,7 +240,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
i->d = 3.1416;
any <<= *i;
- Param_Test::Fixed_Struct *o;
+ const Param_Test::Fixed_Struct *o = 0;
if (!(any >>= o)
|| o->l != i->l
@@ -288,7 +288,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
}
any <<= *i;
- CORBA::LongSeq *o;
+ const CORBA::LongSeq *o = 0;
if (!(any >>= o)
|| (*i)[0] != (*o)[0]
diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp
index 7d14e688068..266bca9e168 100644
--- a/TAO/tests/Param_Test/bd_array_seq.cpp
+++ b/TAO/tests/Param_Test/bd_array_seq.cpp
@@ -51,7 +51,7 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::Bounded_ArraySeq *tmp;
+ const Param_Test::Bounded_ArraySeq *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::Bounded_ArraySeq (*tmp);
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index 7151ad9dd93..6f896872412 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -48,7 +48,7 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::Bounded_Short_Seq *tmp;
+ const Param_Test::Bounded_Short_Seq *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::Bounded_Short_Seq (*tmp);
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index 3be53bb3be0..7a4cae63357 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -51,7 +51,7 @@ Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::Bounded_StructSeq *tmp;
+ const Param_Test::Bounded_StructSeq *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::Bounded_StructSeq (*tmp);
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index 781083ff5d7..f03f3c91d50 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -47,7 +47,7 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::Big_Union *tmp;
+ const Param_Test::Big_Union *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::Big_Union (*tmp);
diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp
index 81bb4f98331..0fbb1b12eb7 100644
--- a/TAO/tests/Param_Test/complex_any.cpp
+++ b/TAO/tests/Param_Test/complex_any.cpp
@@ -174,8 +174,8 @@ Test_Complex_Any::run_sii_test (Param_Test_ptr objref)
CORBA::Boolean
Test_Complex_Any::check_validity (void)
{
- CORBA::AnySeq *level2_in_seq;
- CORBA::AnySeq *level2_test_seq;
+ const CORBA::AnySeq *level2_in_seq = 0;
+ const CORBA::AnySeq *level2_test_seq = 0;
if (!(this->in_ >>= level2_in_seq))
return 0;
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index 03b9ae14519..616ef6659d6 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -70,8 +70,8 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req)
}
catch (CORBA::UnknownUserException& user_ex)
{
- Param_Test::Ooops* oops;
- Param_Test::BadBoy* bad_boy;
+ const Param_Test::Ooops* oops = 0;
+ const Param_Test::BadBoy* bad_boy = 0;
if (user_ex.exception () >>= oops)
{
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index 076d7889728..d8eea89b958 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -44,7 +44,7 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::Fixed_Struct *tmp;
+ const Param_Test::Fixed_Struct *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = *tmp;
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index 5892241a0ac..b3f52f871a0 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -49,7 +49,7 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::Nested_Struct *tmp;
+ const Param_Test::Nested_Struct *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::Nested_Struct (*tmp);
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index 1e038750805..41c48a99846 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -50,7 +50,7 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::Objref_Struct *tmp;
+ const Param_Test::Objref_Struct *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::Objref_Struct (*tmp);
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index fa5adff51ed..e1c09e1bce0 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -50,7 +50,7 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::Recursive_Struct *tmp;
+ const Param_Test::Recursive_Struct *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::Recursive_Struct (*tmp);
diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp
index 7b40a95b1a2..131bd96766a 100644
--- a/TAO/tests/Param_Test/recursive_union.cpp
+++ b/TAO/tests/Param_Test/recursive_union.cpp
@@ -49,7 +49,7 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::Recursive_Union *tmp;
+ const Param_Test::Recursive_Union *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::Recursive_Union (*tmp);
diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index 8cea7c816cd..4f2053fe554 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -47,7 +47,7 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::Small_Union *tmp;
+ const Param_Test::Small_Union *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::Small_Union (*tmp);
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index ff7358c4ba3..5787515235c 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -53,7 +53,7 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- CORBA::AnySeq* tmp;
+ const CORBA::AnySeq* tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new CORBA::AnySeq (*tmp);
diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp
index 455b032a7b0..509654d394f 100644
--- a/TAO/tests/Param_Test/ub_array_seq.cpp
+++ b/TAO/tests/Param_Test/ub_array_seq.cpp
@@ -50,7 +50,7 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::ArraySeq *tmp;
+ const Param_Test::ArraySeq *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::ArraySeq (*tmp);
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index cee70167a12..96b1429e91c 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -49,7 +49,7 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- CORBA::LongSeq *tmp;
+ const CORBA::LongSeq *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = CORBA::LongSeq (*tmp);
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index 03884e85b0c..de8da49add5 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -59,7 +59,7 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::Coffee_Mix *tmp;
+ const Param_Test::Coffee_Mix *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::Coffee_Mix (*tmp);
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index 254569466cd..50cf2c2064f 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -49,7 +49,7 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- CORBA::ShortSeq *tmp;
+ const CORBA::ShortSeq *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new CORBA::ShortSeq (*tmp);
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 6248e49e707..8fc56d50925 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -49,7 +49,7 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- CORBA::StringSeq *tmp;
+ const CORBA::StringSeq *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new CORBA::StringSeq (*tmp);
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index 0f70d4158a6..4c68746f8b8 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -51,7 +51,7 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::StructSeq *tmp;
+ const Param_Test::StructSeq *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::StructSeq (*tmp);
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp
index 5de8fe57dc3..0aff960b0c8 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp
@@ -50,7 +50,7 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- CORBA::WStringSeq *tmp;
+ const CORBA::WStringSeq *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new CORBA::WStringSeq (*tmp);
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index d86c4851736..b151e26ddb2 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -50,7 +50,7 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req)
req->invoke ();
- Param_Test::Var_Struct *tmp;
+ const Param_Test::Var_Struct *tmp = 0;
req->return_value () >>= tmp;
this->ret_ = new Param_Test::Var_Struct (*tmp);
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
index 6bad18941ff..7289df05aaa 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
@@ -66,7 +66,7 @@ Vault_Client_Request_Interceptor::send_request (
Dynamic::ParameterList_var paramlist =
ri->arguments ();
- Test_Interceptors::Secure_Vault::Record *record;
+ const Test_Interceptors::Secure_Vault::Record *record = 0;
CORBA::Long id;
CORBA::ULong i = 0; // index -- explicitly used to avoid
// overloaded operator ambiguity.
@@ -261,7 +261,7 @@ Vault_Client_Request_Dynamic_Interceptor::send_request (
Dynamic::ParameterList_var paramlist =
ri->arguments ();
- Test_Interceptors::Secure_Vault::Record *record;
+ const Test_Interceptors::Secure_Vault::Record *record = 0;
CORBA::Long id;
CORBA::ULong i = 0; // index -- explicitly used to avoid
// overloaded operator ambiguity.
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
index ab937bde14d..1cb6435172c 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
@@ -60,7 +60,7 @@ Vault_Server_Request_Interceptor::receive_request (
Dynamic::ParameterList_var paramlist =
ri->arguments ();
- Test_Interceptors::Secure_Vault::Record *record;
+ const Test_Interceptors::Secure_Vault::Record *record = 0;
CORBA::Long id;
CORBA::ULong i = 0; // index -- explicitly used to avoid
// overloaded operator ambiguity.
@@ -209,7 +209,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request (
Dynamic::ParameterList_var paramlist =
ri->arguments ();
- Test_Interceptors::Secure_Vault::Record *record;
+ const Test_Interceptors::Secure_Vault::Record *record = 0;
CORBA::Long id;
CORBA::ULong i = 0; // index -- explicitly used to avoid
// overloaded operator ambiguity.
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index 67647774e66..af4dab6e0b9 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -210,7 +210,7 @@ Echo_Client_Request_Interceptor::receive_reply (
{
CORBA::Any_var a = ri->result ();
- Test_Interceptors::Visual::VarLenStruct * v;
+ const Test_Interceptors::Visual::VarLenStruct * v = 0;
(a.in ()) >>= v;