summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLog-98c16
-rw-r--r--TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp15
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp1
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_client.cpp11
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_tests.cpp6
-rw-r--r--TAO/orbsvcs/tests/Concurrency/NS_client.cpp4
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp4
-rw-r--r--TAO/tao/Server_Request.cpp6
-rw-r--r--TAO/tao/encode.cpp4
-rw-r--r--TAO/tao/skip.cpp7
-rw-r--r--TAO/tests/CDR/basic_types.cpp2
12 files changed, 31 insertions, 46 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 12a53f52245..8d804e0b612 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,19 @@
+Thu May 7 11:34:13 1998 Carlos O'Ryan <coryan@swarm.cs.wustl.edu>
+
+ * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
+ Fixed template instantiation pragmas.
+
+ * tests/CDR/basic_types.cpp:
+ * orbsvcs/tests/Concurrency/NS_client.cpp:
+ * orbsvcs/tests/Concurrency/CC_client.cpp:
+ * orbsvcs/tests/Concurrency/CC_tests.cpp:
+ * orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp:
+ * orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp:
+ * tao/skip.cpp:
+ * tao/encode.cpp:
+ * tao/Server_Request.cpp:
+ Fixed several warnings, mostly unused variables.
+
Thu May 07 11:19:25 1998 David L. Levine <levine@cs.wustl.edu>
* orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: added
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
index 8ae74eebaad..4b226871cff 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
@@ -39,6 +39,7 @@ Concurrency_Service::Concurrency_Service (int argc,
this->init (argc, argv, _env);
}
+int
Concurrency_Service::parse_args (void)
{
ACE_DEBUG ((LM_DEBUG,
@@ -90,10 +91,10 @@ Concurrency_Service::init (int argc,
"child_poa",
_env) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
- "%p\n",
- "init_child_poa"),
- -1);
- TAO_CHECK_ENV_RETURN (env,-1);
+ "%p\n",
+ "init_child_poa"),
+ -1);
+ TAO_CHECK_ENV_RETURN (_env,-1);
this->argc_ = argc;
this->argv_ = argv;
@@ -137,7 +138,7 @@ Concurrency_Service::init_naming_service (CORBA::Environment &_env)
return result;
lockset_factory_ =
this->my_concurrency_server_.GetLockSetFactory ()->_this (_env);
- TAO_CHECK_ENV_RETURN (env, -1);
+ TAO_CHECK_ENV_RETURN (_env, -1);
CosNaming::Name concurrency_context_name (1);
concurrency_context_name.length (1);
@@ -146,7 +147,7 @@ Concurrency_Service::init_naming_service (CORBA::Environment &_env)
this->concurrency_context_ =
this->my_name_server_->bind_new_context (concurrency_context_name,
_env);
- TAO_CHECK_ENV_RETURN (env, -1);
+ TAO_CHECK_ENV_RETURN (_env, -1);
CosNaming::Name lockset_name (1);
lockset_name.length (1);
@@ -154,7 +155,7 @@ Concurrency_Service::init_naming_service (CORBA::Environment &_env)
this->concurrency_context_->bind (lockset_name,
lockset_factory_.in (),
_env);
- TAO_CHECK_ENV_RETURN (env, -1);
+ TAO_CHECK_ENV_RETURN (_env, -1);
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index 5ca5d9a2fdd..d777f3807a2 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -70,6 +70,7 @@ CC_Lock::try_lock (CORBA::Environment &_env)
TAO_THROW_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO),
CORBA::B_FALSE);
}
+ return CORBA::B_TRUE;
}
void
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index 2aaf85afb1f..3f643330d9f 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -97,6 +97,7 @@ CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode,
TAO_RETHROW_RETURN (CORBA::B_FALSE);
}
TAO_ENDTRY;
+ return CORBA::B_TRUE;
}
// Drops the specified lock. In this simple case we have only one lock
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 5b79ca61cff..d58d5ca997d 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -150,8 +150,6 @@ CC_Client::run (void)
int
CC_Client::run_basic_tests (void)
{
- int success = CC_FAIL;
-
Test_Single_Lock_With_Mode t1 (naming_service_,
CosConcurrencyControl::read);
Test_Single_Lock_With_Mode t2 (naming_service_,
@@ -175,7 +173,6 @@ CC_Client::run_basic_tests (void)
int
CC_Client::run_extended_tests (char *params)
{
- char *test;
int success = CC_FAIL;
ACE_DEBUG ((LM_DEBUG,
@@ -331,11 +328,3 @@ main (int argc, char **argv)
return cc_client.run ();
}
}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Env_Value<unsigned long>;
-template class ACE_Env_Value<unsigned short>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Env_Value<unsigned long>
-#pragma instantiate ACE_Env_Value<unsigned short>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index 24fc5d77fbc..eae3bd7e479 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -168,8 +168,6 @@ Test_Setup_LockSet::~Test_Setup_LockSet (void)
int
Test_Setup_LockSet::run (int times_to_run)
{
- CORBA::Boolean lock_held = CORBA::B_FALSE;
-
TAO_TRY
{
CosConcurrencyControl::LockSet_ptr cc_lock_set_ =
@@ -209,8 +207,6 @@ Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet (void)
int
Test_Use_Already_Created_LockSet::run (int times_to_run)
{
- CORBA::Boolean lock_held = CORBA::B_FALSE;
-
TAO_TRY
{
CORBA::Object_var ccls_obj =
@@ -249,8 +245,6 @@ Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet (void)
int
Test_Unlock_Already_Created_LockSet::run (int times_to_run)
{
- CORBA::Boolean lock_held = CORBA::B_FALSE;
-
TAO_TRY
{
CORBA::Object_var ccls_obj =
diff --git a/TAO/orbsvcs/tests/Concurrency/NS_client.cpp b/TAO/orbsvcs/tests/Concurrency/NS_client.cpp
index 2b0c7fc0eae..1f079a2351e 100644
--- a/TAO/orbsvcs/tests/Concurrency/NS_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/NS_client.cpp
@@ -124,6 +124,7 @@ CosNaming_Client::resolve_name (char *c, char *n)
return -1;
}
TAO_ENDTRY;
+ return 0;
}
void
@@ -132,7 +133,6 @@ CosNaming_Client::list_contents (void)
CosNaming::BindingIterator_var bi;
CosNaming::BindingList_var li;
CORBA::ULong how_many = 0;
- CORBA::Boolean more = CORBA::B_FALSE;
CosNaming::Binding_var b;
CosNaming::Name n;
CORBA::ULong names = 0;
@@ -141,7 +141,7 @@ CosNaming_Client::list_contents (void)
{
this->naming_context_->list (how_many, li, bi, TAO_TRY_ENV);
- while (more = bi->next_one (b, TAO_TRY_ENV))
+ while (bi->next_one (b, TAO_TRY_ENV))
{
n = b->binding_name;
names = n.length ();
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 4bf88c06f41..94f11d56d78 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -1591,7 +1591,7 @@ template class ACE_PushConsumer_Adapter<Test_Supplier>;
template class auto_ptr<POA_RtecScheduler::Scheduler>;
#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
#pragma instantiate ACE_Auto_Basic_Ptr<POA_RtecScheduler::Scheduler>
-#pragma instantiate ACE_Condition<ACE_Thread_Mutex> ready_cnd_
+#pragma instantiate ACE_Condition<ACE_Thread_Mutex>
#pragma instantiate ACE_PushConsumer_Adapter<Test_Supplier>
-#pragma instantiate auto_ptr<ACE_Config_Scheduler>
+#pragma instantiate auto_ptr<POA_RtecScheduler::Scheduler>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Server_Request.cpp b/TAO/tao/Server_Request.cpp
index 323a7fe8ae1..2ba7d6c08e6 100644
--- a/TAO/tao/Server_Request.cpp
+++ b/TAO/tao/Server_Request.cpp
@@ -239,12 +239,6 @@ IIOP_ServerRequest::demarshal (CORBA::Environment &env, // exception reporting
const TAO_Call_Data_Skel *info, // call description
...) // ... any parameters
{
- // First find out the size of the list to be created. info->count
- // keeps track of the table size. If "roundtrip" is true => one
- // entry is for RETURN type which does not go into the NVList
- CORBA::ULong list_size =
- info->is_roundtrip ? (info->param_count - 1) : info->param_count;
-
CORBA::NVList_ptr nvlist;
// Create an NVList
diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp
index c150f4a7a5c..72af056ffcc 100644
--- a/TAO/tao/encode.cpp
+++ b/TAO/tao/encode.cpp
@@ -103,9 +103,6 @@ TAO_Marshal_Any::encode (CORBA::TypeCode_ptr,
// Typecode of the element that makes the Any.
CORBA::TypeCode_ptr elem_tc;
- // Value maintained by the Any.
- void *value;
-
TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
// Status of encode operation
@@ -117,7 +114,6 @@ TAO_Marshal_Any::encode (CORBA::TypeCode_ptr,
// Encode the typecode description for the element.
if (stream->encode (CORBA::_tc_TypeCode, &elem_tc, 0, env)
== CORBA::TypeCode::TRAVERSE_CONTINUE) {
- value = (void *) any->value ();
// if the any owns the data, then the value is a CDR stream and we simply
// append the CDR stream
if (any->any_owns_data_)
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index 6cacbba9810..cd9bb9c4484 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -594,9 +594,6 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc,
{
CORBA::Boolean continue_skipping = CORBA::B_TRUE;
TAO_InputCDR *stream = (TAO_InputCDR *) context;
- // Return status.
- CORBA::TypeCode::traverse_status retval =
- CORBA::TypeCode::TRAVERSE_CONTINUE;
// Typecode of the element.
CORBA::TypeCode_ptr tc2;
// Size of element.
@@ -645,10 +642,6 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc,
CORBA::Boolean continue_skipping = CORBA::B_TRUE;
TAO_InputCDR *stream = (TAO_InputCDR *) context;
- // Return status.
- CORBA::TypeCode::traverse_status retval =
- CORBA::TypeCode::TRAVERSE_CONTINUE;
-
// Typecode of the element.
CORBA::TypeCode_ptr tc2;
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index 89a8ccae446..bae90b66fa7 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -108,7 +108,6 @@ test_get (TAO_InputCDR &cdr, const CDR_Test_Types &test_types)
CORBA::Octet xo;
CORBA::Short xs;
CORBA::Long xl;
- CORBA::String xstr;
CORBA::Any any;
CORBA::Environment env;
@@ -165,6 +164,7 @@ test_get (TAO_InputCDR &cdr, const CDR_Test_Types &test_types)
i),
1);
#if 0
+ CORBA::String xstr;
if (cdr.read_string (xstr) == 0)
ACE_ERROR_RETURN ((LM_ERROR,
"read_string2[%d] failed\n",
View Lorry Controller Status