summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLog16
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp2
-rw-r--r--TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp10
-rw-r--r--TAO/tests/Codec/Codec.mpc2
-rw-r--r--TAO/tests/DynAny_Test/analyzer.cpp46
-rw-r--r--TAO/tests/DynAny_Test/test_dynunion.cpp45
-rw-r--r--TAO/tests/Param_Test/Param_Test.mpc4
8 files changed, 102 insertions, 25 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index cd6dbff3dc4..1c6ad0ea6d0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Sat Apr 9 00:02:16 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
+
+ * examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+ (copy):
+ * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp (copy):
+
+ Added missing semi-colon.
+
+ * tests/Bug_1535_Regression/bug_1535_regression.cpp
+ (test_create_object_before_servant_reactivation):
+ (test_create_object_before_POA_reactivation):
+ * tests/DynAny_Test/analyzer.cpp (analyze):
+ * tests/DynAny_Test/test_dynunion.cpp (run_test):
+
+ Fixed emulated exception usage.
+
Fri Apr 8 23:46:47 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
* orbsvcs/tests/FT_App/FT_TestReplica_i.cpp (repository_id):
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index 4aa5eb0180d..ff32732b90d 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -32,7 +32,7 @@ Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
CORBA::NO_MEMORY ());
ACE_CHECK_RETURN (CORBA::Policy::_nil ());
- copy->value (this->value_ ACE_ENV_ARG_PARAMETER)
+ copy->value (this->value_ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return copy;
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
index dd80febcece..cd38bc9603f 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
@@ -55,7 +55,7 @@ Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
CORBA::NO_MEMORY ());
ACE_CHECK_RETURN (CORBA::Policy::_nil ());
- copy->importance (this->importance_ ACE_ENV_ARG_PARAMETER)
+ copy->importance (this->importance_ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return copy;
diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
index c7a7ff02c0b..64179f21c22 100644
--- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
+++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
@@ -61,10 +61,13 @@ test_create_object_before_servant_reactivation (
PortableServer::ObjectId_var oid =
PortableServer::string_to_ObjectId ("TestServant");
+ char const * id = _tc_Test->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK;
+
CORBA::Object_var object =
persistent_poa->create_reference_with_id (
oid.in (),
- _tc_Test->id()
+ id
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
@@ -127,9 +130,12 @@ test_create_object_before_POA_reactivation(
PortableServer::ObjectId_var oid =
PortableServer::string_to_ObjectId ("TestServant");
+ char const * id = _tc_Test->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK;
+
CORBA::Object_var object =
persistent_poa->create_reference_with_id (oid.in (),
- _tc_Test->id ()
+ id,
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
diff --git a/TAO/tests/Codec/Codec.mpc b/TAO/tests/Codec/Codec.mpc
index 39f2d1aa2bc..9805a5b799f 100644
--- a/TAO/tests/Codec/Codec.mpc
+++ b/TAO/tests/Codec/Codec.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*Client): taoclient {
+project(*Client): taoclient,typecodefactory {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/DynAny_Test/analyzer.cpp b/TAO/tests/DynAny_Test/analyzer.cpp
index 3ff7ec43ff3..08c1c9e4fd3 100644
--- a/TAO/tests/DynAny_Test/analyzer.cpp
+++ b/TAO/tests/DynAny_Test/analyzer.cpp
@@ -55,15 +55,22 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
{
CORBA::TypeCode_var tc = da->type();
+ CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK;
+
// strip aliases
- while( tc->kind() == CORBA::tk_alias )
+ while (kind == CORBA::tk_alias)
{
- tc = tc->content_type();
+ tc = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK;
+
+ kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK;
}
- switch( tc->kind() )
+ switch (kind)
{
- case CORBA::tk_struct :
+ case CORBA::tk_struct:
{
DynamicAny::DynStruct_var ds
= DynamicAny::DynStruct::_narrow(da ACE_ENV_ARG_PARAMETER);
@@ -154,7 +161,12 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
"ARRAY\n"));
level_++;
- for( unsigned int i = 0 ; i < tc->length() ; i++ )
+
+ CORBA::ULong const len =
+ tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK;
+
+ for( unsigned int i = 0 ; i < len; ++i)
{
tab(level_);
@@ -254,9 +266,16 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
case CORBA::tk_TypeCode:
{
tab(level_);
- if (debug_) \
- ACE_DEBUG ((LM_DEBUG,
- " Value (TypeCode) = %d\n" , da->get_typecode()->kind()));
+ if (debug_)
+ {
+ CORBA::TCKind const kind =
+ da->get_typecode ()->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK;
+
+ ACE_DEBUG ((LM_DEBUG,
+ " Value (TypeCode) = %d\n",
+ static_cast<int> (kind)));
+ }
}
break;
@@ -264,8 +283,15 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
{
tab(level_);
if (debug_)
- ACE_DEBUG ((LM_DEBUG,
- " unhandled typecode = %d\n", (int) tc->kind()));
+ {
+ CORBA::TCKind const kind =
+ tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK;
+
+ ACE_DEBUG ((LM_DEBUG,
+ " unhandled typecode = %d\n",
+ static_cast<int> (kind)));
+ }
}
break;
}
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index 3de76b969e0..a42f0ef2347 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -122,7 +122,12 @@ Test_DynUnion::run_test (void)
CORBA::TypeCode_var s_out1 = fa1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- if (s_out1.in ()->equal (data.m_typecode1))
+ CORBA::Boolean const equal_tc1 =
+ s_out1->equal (data.m_typecode1
+ ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
+ if (equal_tc1)
{
ACE_DEBUG ((LM_DEBUG,
"++ OK ++\n"));
@@ -163,10 +168,16 @@ Test_DynUnion::run_test (void)
ftc1->seek (1
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- CORBA::TypeCode_var s_out2 = ftc1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::TypeCode_var s_out2 =
+ ftc1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
+ CORBA::Boolean const equal_tc2 =
+ s_out2->equal (data.m_typecode1
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- if (s_out2.in ()->equal (data.m_typecode1))
+ if (equal_tc2)
{
ACE_DEBUG ((LM_DEBUG,
"++ OK ++\n"));
@@ -221,11 +232,24 @@ Test_DynUnion::run_test (void)
ACE_ENDTRY;
ACE_TRY_CHECK;
- if ( ! CORBA::is_nil (s_out3.in ()) &&
- s_out3.in ()->equal (data.m_typecode1))
+ if (equal_tc)
+
+ if (!CORBA::is_nil (s_out3.in ()))
{
- ACE_DEBUG ((LM_DEBUG,
- "++ OK ++\n"));
+ CORBA::Boolean const equal_tc =
+ s_out3->equal (data.m_typecode1
+ ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
+ if (equal_tc)
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ "++ OK ++\n"));
+ }
+ else
+ {
+ ++this->error_count_;
+ }
}
else
{
@@ -268,9 +292,14 @@ Test_DynUnion::run_test (void)
CORBA::TypeCode_var tc3 = dp3->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
+ CORBA::Boolean const equal_tc3 =
+ data.m_typecode1->equal (tc3.in ()
+ ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
if (!ACE_OS::strcmp (m_nm.in (), "tc")
&& tk == CORBA::tk_TypeCode
- && data.m_typecode1->equal (tc3.in ()))
+ && equal_tc3)
{
ACE_DEBUG ((LM_DEBUG,
"++ OK ++\n"));
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 0967155b0dc..1d3236f8d2b 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*Server): messaging, taoexe, portableserver, minimum_corba {
+project(*Server): messaging, taoexe, portableserver, minimum_corba, typecodefactory {
idlflags += -GA
Source_Files {
@@ -10,7 +10,7 @@ project(*Server): messaging, taoexe, portableserver, minimum_corba {
}
}
-project(*Client): messaging, taoexe, portableserver, minimum_corba, dynamicinterface {
+project(*Client): messaging, taoexe, portableserver, minimum_corba, dynamicinterface, typecodefactory {
exename = client
idlflags += -GA
View Lorry Controller Status