diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-25 00:40:19 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-25 00:40:19 +0000 |
| commit | 6add26de444f2ee728ab1f54d619eb6966f0237e (patch) | |
| tree | 7186f9cc2016f800491b0c27a7e73fb24ce91220 | |
| parent | 77514a55589ec9f60354b1960af4b6afc52c45dc (diff) | |
| download | ATCD-6add26de444f2ee728ab1f54d619eb6966f0237e.tar.gz | |
ChangeLogTag: Thu Oct 24 19:32:08 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
75 files changed, 580 insertions, 780 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5338d6fc45f..d955b980f2d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,20 @@ +Thu Oct 24 19:32:08 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * Reverted the changes made in the following entries: + Thu Oct 24 10:59:20 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + Thu Oct 24 10:39:10 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + Thu Oct 24 09:29:59 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + Thu Oct 24 000:33:17 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + Wed Oct 23 23:51:51 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + Wed Oct 23 23:37:32 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + Wed Oct 23 22:48:09 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + Wed Oct 23 16:32:36 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + Wed Oct 23 13:38:59 2002 Nanbor Wang <nanbor@cs.wustl.edu> + Wed Oct 23 10:26:59 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>. + Basically the changes made were not right. Hence the need for + reversion to yesterday mornings status. + + Thu Oct 24 10:59:20 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> * examples/Load_Balancing/Identity_Server.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp index 6053605b052..45384a20aee 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp @@ -278,29 +278,35 @@ int be_visitor_args_arglist::visit_string (be_string *node) { TAO_OutStream *os = this->ctx_->stream (); - switch (this->direction ()) + if (node->width () == (long) sizeof (char)) { - case AST_Argument::dir_IN: - *os << "const " << this->type_name (node); - break; - case AST_Argument::dir_INOUT: - *os << this->type_name (node) << "&"; - break; - case AST_Argument::dir_OUT: - if (this->ctx_->alias ()) - { - *os << this->type_name (node, "_out"); - } - else if (node->width () == (long) sizeof (char)) + switch (this->direction ()) { + case AST_Argument::dir_IN: + *os << "const char *"; + break; + case AST_Argument::dir_INOUT: + *os << "char *&"; + break; + case AST_Argument::dir_OUT: *os << "CORBA::String_out"; + break; } - else + } + else + { + switch (this->direction ()) { + case AST_Argument::dir_IN: + *os << "const CORBA::WChar *"; + break; + case AST_Argument::dir_INOUT: + *os << "CORBA::WChar *&"; + break; + case AST_Argument::dir_OUT: *os << "CORBA::WString_out"; + break; } - - break; } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp index 264ef4290d3..74090920d4a 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp @@ -61,24 +61,9 @@ be_visitor_args::type_name (be_type *node, bt = node; } - AST_Decl::NodeType nt = bt->node_type (); - - if (nt == AST_Decl::NT_string) - { - ACE_OS::sprintf (namebuf, - "char *"); - } - else if (nt == AST_Decl::NT_wstring) - { - ACE_OS::sprintf (namebuf, - "CORBA::WChar *"); - } - else - { - ACE_OS::sprintf (namebuf, - "%s", - bt->full_name ()); - } + ACE_OS::sprintf (namebuf, + "%s", + bt->full_name ()); if (suffix) { diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp index 1dec0439f88..9896c17f4f9 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp @@ -48,7 +48,6 @@ int be_visitor_args_request_info_arglist::visit_argument (be_argument *node) // retrieve the type be_type *bt = be_type::narrow_from_decl (node->field_type ()); - if (!bt) { ACE_ERROR_RETURN ((LM_ERROR, @@ -303,25 +302,35 @@ int be_visitor_args_request_info_arglist::visit_string (be_string *node) { TAO_OutStream *os = this->ctx_->stream (); - switch (this->direction ()) + if (node->width () == (long) sizeof (char)) { - case AST_Argument::dir_IN: - *os << "const " << this->type_name (node); - break; - case AST_Argument::dir_INOUT: - *os << this->type_name (node) << "&"; - break; - case AST_Argument::dir_OUT: - if (node->width () == (long) sizeof (char)) + switch (this->direction ()) { - *os << "CORBA::String_out "; + case AST_Argument::dir_IN: + *os << "const char *"; + break; + case AST_Argument::dir_INOUT: + *os << "char *&"; + break; + case AST_Argument::dir_OUT: + *os << "CORBA::String_out"; + break; } - else + } + else + { + switch (this->direction ()) { - *os << "CORBA::WString_out "; + case AST_Argument::dir_IN: + *os << "const CORBA::WChar *"; + break; + case AST_Argument::dir_INOUT: + *os << "CORBA::WChar *&"; + break; + case AST_Argument::dir_OUT: + *os << "CORBA::WString_out"; + break; } - - break; } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp index 1b3234de34e..8ba93c73b82 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp @@ -298,25 +298,35 @@ int be_visitor_args_request_info_ch::visit_string (be_string *node) { TAO_OutStream *os = this->ctx_->stream (); - switch (this->direction ()) + if (node->width () == 1) { - case AST_Argument::dir_IN: - *os << "const " << this->type_name (node); - break; - case AST_Argument::dir_INOUT: - *os << this->type_name (node); - break; - case AST_Argument::dir_OUT: - if (node->width () == (long) sizeof (char)) + switch (this->direction ()) { + case AST_Argument::dir_IN: + *os << "const char *"; + break; + case AST_Argument::dir_INOUT: + *os << "char *"; + break; + case AST_Argument::dir_OUT: *os << "CORBA::String_out "; + break; } - else + } + else + { + switch (this->direction ()) { + case AST_Argument::dir_IN: + *os << "const CORBA::WChar *"; + break; + case AST_Argument::dir_INOUT: + *os << "CORBA::WChar *"; + break; + case AST_Argument::dir_OUT: *os << "CORBA::WString_out "; + break; } - - break; } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp index 492b744e5e6..abaf16de16d 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp @@ -253,25 +253,35 @@ int be_visitor_args_request_info_sh::visit_string (be_string *node) { TAO_OutStream *os = this->ctx_->stream (); - switch (this->direction ()) + if (node->width () == 1) { - case AST_Argument::dir_IN: - *os << "const " << this->type_name (node) << " &"; - break; - case AST_Argument::dir_INOUT: - *os << this->type_name (node) << " &"; - break; - case AST_Argument::dir_OUT: - if (node->width () == (long) sizeof (char)) + switch (this->direction ()) { + case AST_Argument::dir_IN: + *os << "const char *"; + break; + case AST_Argument::dir_INOUT: + *os << "char *&"; + break; + case AST_Argument::dir_OUT: *os << "CORBA::String_out "; + break; } - else + } + else + { + switch (this->direction ()) { - *os << "CORBA::WString_out "; + case AST_Argument::dir_IN: + *os << "const CORBA::WChar *"; + break; + case AST_Argument::dir_INOUT: + *os << "CORBA::WChar *&"; + break; + case AST_Argument::dir_OUT: + *os << "CORBA::WString_out"; + break; } - - break; } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp index 0b13a232bcf..2692167cb45 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp @@ -442,7 +442,7 @@ int be_visitor_args_upcall_ss::visit_sequence (be_sequence *) return 0; } -int be_visitor_args_upcall_ss::visit_string (be_string *node) +int be_visitor_args_upcall_ss::visit_string (be_string *) { TAO_OutStream *os = this->ctx_->stream (); be_argument *arg = this->ctx_->be_node_as_argument (); @@ -457,24 +457,7 @@ int be_visitor_args_upcall_ss::visit_string (be_string *node) } else { - *os << "ACE_const_cast (const "; - - be_type *bt = this->ctx_->alias (); - - if (bt != 0) - { - *os << bt->name (); - } - else if (node->width () == (long) sizeof (char)) - { - *os << "char *"; - } - else - { - *os << "CORBA::WChar *"; - } - - *os << ", " << arg->local_name () << ".in ())"; + *os << arg->local_name () << ".in ()"; } break; @@ -485,8 +468,8 @@ int be_visitor_args_upcall_ss::visit_string (be_string *node) *os << arg->local_name (); } else - { - *os << arg->local_name () << ".inout ()"; + { + *os << arg->local_name () << ".inout ()"; } break; diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp index 0872648eae5..20e17732581 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp @@ -386,20 +386,32 @@ int be_visitor_args_vardecl_ss::visit_string (be_string *node) TAO_OutStream *os = this->ctx_->stream (); be_argument *arg = this->ctx_->be_node_as_argument (); - if (this->ctx_->alias ()) - { - *os << this->type_name (node, "_var "); - } - else if (node->width () == (long) sizeof (char)) - { - *os << "CORBA::String_var "; - } - else + switch (this->direction ()) { - *os << "CORBA::WString_var "; - } + case AST_Argument::dir_IN: + case AST_Argument::dir_INOUT: + if (node->width () == (long) sizeof (char)) + { + *os << "CORBA::String_var " << arg->local_name () << ";"; + } + else + { + *os << "CORBA::WString_var " << arg->local_name () << ";"; + } + + break; + case AST_Argument::dir_OUT: + if (node->width () == (long )sizeof (char)) + { + *os << "CORBA::String_var " << arg->local_name () << ";"; + } + else + { + *os << "CORBA::WString_var " << arg->local_name () << ";"; + } - *os << arg->local_name () << ";"; + break; + } return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp index 60a9e751fdb..c4281f40ac7 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp @@ -382,7 +382,7 @@ int be_visitor_exception_ctor::visit_sequence (be_sequence *node) int be_visitor_exception_ctor::visit_string (be_string *node) { - TAO_OutStream *os = this->ctx_->stream (); + TAO_OutStream *os = this->ctx_->stream (); // get output stream if (node->width () == (long) sizeof (char)) { diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp index 6cef9ec9397..1c57bdb2439 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp @@ -176,7 +176,7 @@ be_visitor_operation_interceptors_cs::generate_class_declaration ( *os << be_uidt; } - *os << be_uidt_nl << ");" << be_uidt_nl << be_nl; + *os << ");\n" << be_uidt_nl; // Here I still need to generate the other methods + private args. *os << "virtual Dynamic::ParameterList * arguments " diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_info_rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_info_rettype.cpp index be1132e777f..6094412d1f5 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_info_rettype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_info_rettype.cpp @@ -203,13 +203,8 @@ int be_visitor_operation_interceptors_info_rettype::visit_string (be_string *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = this->ctx_->alias (); - if (bt != 0) - { - *os << bt->name (); - } - else if (node->width () == (long) sizeof (char)) + if (node->width () == (long) sizeof (char)) { *os << "char *"; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp index c0d021f7ba2..a92df07a4c2 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp @@ -216,13 +216,8 @@ int be_visitor_operation_rettype::visit_string (be_string *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = this->ctx_->alias (); - if (bt != 0) - { - *os << bt->name (); - } - else if (node->width () == (long) sizeof (char)) + if (node->width () == (long) sizeof (char)) { *os << "char *"; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp index aed377cc5c3..03c5ebe2613 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp @@ -140,13 +140,8 @@ int be_visitor_sequence_buffer_type::visit_string (be_string *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = this->ctx_->alias (); - if (bt != 0) - { - *os << bt->name (); - } - else if (node->width () == (long) sizeof (char)) + if (node->width () == (long) sizeof (char)) { *os << "char *"; } diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp index 1cae88fdac3..a3d720f5608 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp @@ -3013,16 +3013,15 @@ be_visitor_typecode_defn::compute_tc_size (be_typedef *node) else { if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_typecode_defn::" - "compute_tc_size (typedef) - " - "queue insert failed\n"), - -1); - } + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_typecode_defn::" + "compute_tc_size (typedef) - " + "queue insert failed\n"), + -1); + } this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN); - if (node->accept (this) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -3054,7 +3053,6 @@ be_visitor_typecode_defn::compute_encap_length (be_typedef *node) // add the encapsulation length of our base type bt = be_type::narrow_from_decl (node->base_type ()); this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE); - if (!bt || bt->accept (this) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -3066,6 +3064,7 @@ be_visitor_typecode_defn::compute_encap_length (be_typedef *node) this->computed_encap_len_ = encap_len + this->computed_tc_size_; return this->computed_encap_len_; + } @@ -3428,7 +3427,6 @@ be_visitor_typecode_defn::gen_repoID (be_decl *node) // size of the repoID field this->tc_offset_ += (arrlen + 1) * sizeof (ACE_CDR::ULong); } - *os << "\n"; return; diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp index 6b679cffc12..2340ba59374 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp @@ -104,7 +104,6 @@ be_visitor_typedef_any_op_ch::visit_typedef (be_typedef *node) "failed to accept visitor\n"), -1); } - this->ctx_->alias (0); // reset } else diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp index bdd5b71ed33..4fb31825759 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing/Identity_Client.cpp @@ -130,8 +130,7 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL) "Identity_Client: Requesting Object Group " "with id <%s>\n", group_name)); Load_Balancer::Object_Group_var object_group = - factory->resolve (ACE_const_cast (const Load_Balancer::Group_ID, - group_name) + factory->resolve (group_name ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp index 394c69643f0..dfc94035395 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing/Identity_Server.cpp @@ -107,8 +107,7 @@ Identity_Server::init (int argc, "Group with id <Identity, Random>\n")); Load_Balancer::Object_Group_var random_group = - factory->make_random (ACE_const_cast (const Load_Balancer::Group_ID, - "Identity, Random") + factory->make_random ("Identity, Random" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -117,8 +116,7 @@ Identity_Server::init (int argc, "Object Group with id <Identity, Round Robin>\n")); Load_Balancer::Object_Group_var rr_group = - factory->make_round_robin (ACE_const_cast (const Load_Balancer::Group_ID, - "Identity, Round Robin") + factory->make_round_robin ("Identity, Round Robin" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp index 6dd12dea7a3..78537a45bd4 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp @@ -32,7 +32,7 @@ Object_Group_Factory_i::remove_group (const ACE_CString &id, } Load_Balancer::Object_Group_ptr -Object_Group_Factory_i::make_round_robin (const Load_Balancer::Group_ID id +Object_Group_Factory_i::make_round_robin (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) @@ -43,7 +43,7 @@ Object_Group_Factory_i::make_round_robin (const Load_Balancer::Group_ID id } Load_Balancer::Object_Group_ptr -Object_Group_Factory_i::make_random (const Load_Balancer::Group_ID id +Object_Group_Factory_i::make_random (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) @@ -55,7 +55,7 @@ Object_Group_Factory_i::make_random (const Load_Balancer::Group_ID id Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_group (int random, - const Load_Balancer::Group_ID id + const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) @@ -122,7 +122,7 @@ Object_Group_Factory_i::make_group (int random, } Load_Balancer::Object_Group_ptr -Object_Group_Factory_i::resolve (const Load_Balancer::Group_ID id +Object_Group_Factory_i::resolve (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) @@ -256,7 +256,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member } void -Object_Group_i::unbind (const Load_Balancer::Member_ID id +Object_Group_i::unbind (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) @@ -286,7 +286,7 @@ Object_Group_i::unbind (const Load_Balancer::Member_ID id } CORBA::Object_ptr -Object_Group_i::resolve_with_id (const Load_Balancer::Member_ID id +Object_Group_i::resolve_with_id (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) @@ -458,7 +458,7 @@ RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL) } void -RR_Object_Group::unbind (const Load_Balancer::Member_ID id +RR_Object_Group::unbind (const char *id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h index c6f786da3ab..55a649c273e 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h @@ -58,7 +58,7 @@ public: // = Load_Balancer::Object_Group_Factory idl methods. - Load_Balancer::Object_Group_ptr make_round_robin (const Load_Balancer::Group_ID id + Load_Balancer::Object_Group_ptr make_round_robin (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); @@ -68,7 +68,7 @@ public: // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - Load_Balancer::Object_Group_ptr make_random (const Load_Balancer::Group_ID id + Load_Balancer::Object_Group_ptr make_random (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); @@ -78,7 +78,7 @@ public: // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - Load_Balancer::Object_Group_ptr resolve (const Load_Balancer::Group_ID id + Load_Balancer::Object_Group_ptr resolve (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); @@ -115,7 +115,7 @@ private: // = Helper methods. Load_Balancer::Object_Group_ptr make_group (int random, - const Load_Balancer::Group_ID id + const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); @@ -183,7 +183,7 @@ public: // group already contains a member with the same <Member_ID>, a // <duplicate_member> exceptions is thrown. - void unbind (const Load_Balancer::Member_ID id + void unbind (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); @@ -199,7 +199,7 @@ public: // ``round robin.'' If the group contains no members, <no_such_member> // exception is thrown. - CORBA::Object_ptr resolve_with_id (const Load_Balancer::Member_ID id + CORBA::Object_ptr resolve_with_id (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); @@ -294,7 +294,7 @@ public: ~RR_Object_Group (void); // Destructor. - void unbind (const Load_Balancer::Member_ID id + void unbind (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp index 42fa18798b4..d8843235965 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp @@ -156,8 +156,7 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL) #endif /*TAO_MEASURE_STATS*/ // Remote call object_group = - factory->resolve (ACE_const_cast (const Load_Balancer::Group_ID, - group_name) + factory->resolve (group_name ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index 94d95c17e55..5b2aa19c32a 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -140,8 +140,7 @@ Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL) // Unbind the previously registered random group. ACE_TRY_EX (UNBIND_RANDOM) { - factory->unbind_random (ACE_const_cast (const Load_Balancer::Group_ID, - "Random group") + factory->unbind_random ("Random group" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND_RANDOM); } @@ -155,8 +154,7 @@ Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL) // Unbind the previously registered round robin group ACE_TRY_EX (UNBIND_ROUND) { - factory->unbind_round_robin (ACE_const_cast (const Load_Balancer::Group_ID, - "Round Robin group") + factory->unbind_round_robin ("Round Robin group" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND_ROUND); } @@ -170,14 +168,12 @@ Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL) // We want to make two groups Random & Round Robin. Load_Balancer::Object_Group_var random_group = - factory->make_random (ACE_const_cast (const Load_Balancer::Group_ID, - "Random group") + factory->make_random ("Random group" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Load_Balancer::Object_Group_var rr_group = - factory->make_round_robin (ACE_const_cast (const Load_Balancer::Group_ID, - "Round Robin group") + factory->make_round_robin ("Round Robin group" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index 82cc60d6e08..30bb0dd6831 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -47,7 +47,7 @@ Object_Group_Factory_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) Load_Balancer::Object_Group_ptr -Object_Group_Factory_i::make_round_robin (const Load_Balancer::Group_ID id +Object_Group_Factory_i::make_round_robin (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) @@ -78,7 +78,7 @@ Object_Group_Factory_i::make_round_robin (const Load_Balancer::Group_ID id } void -Object_Group_Factory_i::unbind_round_robin (const Load_Balancer::Group_ID id +Object_Group_Factory_i::unbind_round_robin (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) @@ -119,7 +119,7 @@ Object_Group_Factory_i::unbind_round_robin (const Load_Balancer::Group_ID id } Load_Balancer::Object_Group_ptr -Object_Group_Factory_i::make_random (const Load_Balancer::Group_ID id +Object_Group_Factory_i::make_random (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) @@ -151,7 +151,7 @@ Object_Group_Factory_i::make_random (const Load_Balancer::Group_ID id void -Object_Group_Factory_i::unbind_random (const Load_Balancer::Group_ID id +Object_Group_Factory_i::unbind_random (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) @@ -192,7 +192,7 @@ Object_Group_Factory_i::unbind_random (const Load_Balancer::Group_ID id Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_group (int random, - const Load_Balancer::Group_ID id + const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) @@ -308,7 +308,7 @@ Object_Group_Factory_i::make_group (int random, Load_Balancer::Object_Group_ptr -Object_Group_Factory_i::resolve (const Load_Balancer::Group_ID id +Object_Group_Factory_i::resolve (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) @@ -698,7 +698,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member } void -Object_Group_i::unbind (const Load_Balancer::Member_ID id +Object_Group_i::unbind (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) @@ -752,7 +752,7 @@ Object_Group_i::unbind (const Load_Balancer::Member_ID id } char * -Object_Group_i::resolve_with_id (const Load_Balancer::Member_ID id +Object_Group_i::resolve_with_id (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) @@ -948,7 +948,7 @@ RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL) } void -RR_Object_Group::unbind (const Load_Balancer::Member_ID id +RR_Object_Group::unbind (const char *id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h index 3a413e1b40f..7eff01186b3 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h @@ -73,7 +73,7 @@ public: // = Load_Balancer::Object_Group_Factory idl methods. - Load_Balancer::Object_Group_ptr make_round_robin (const Load_Balancer::Group_ID id + Load_Balancer::Object_Group_ptr make_round_robin (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); @@ -83,13 +83,13 @@ public: // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - void unbind_round_robin (const Load_Balancer::Group_ID id + void unbind_round_robin (const char *id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); - Load_Balancer::Object_Group_ptr make_random (const Load_Balancer::Group_ID id + Load_Balancer::Object_Group_ptr make_random (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); @@ -99,12 +99,12 @@ public: // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - void unbind_random (const Load_Balancer::Group_ID id + void unbind_random (const char *id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); - Load_Balancer::Object_Group_ptr resolve (const Load_Balancer::Group_ID id + Load_Balancer::Object_Group_ptr resolve (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); @@ -137,7 +137,7 @@ private: // = Helper methods. Load_Balancer::Object_Group_ptr make_group (int random, - const Load_Balancer::Group_ID id + const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); @@ -229,7 +229,7 @@ public: // group already contains a member with the same <Member_ID>, a // <duplicate_member> exceptions is thrown. - void unbind (const Load_Balancer::Group_ID id + void unbind (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); @@ -245,7 +245,7 @@ public: // ``round robin.'' If the group contains no members, <no_such_member> // exception is thrown. - char * resolve_with_id (const Load_Balancer::Group_ID id + char * resolve_with_id (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); @@ -329,7 +329,7 @@ public: PortableServer::POA_ptr poa); // Constructor. - void unbind (const Load_Balancer::Group_ID id + void unbind (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); @@ -337,7 +337,7 @@ public: // Object_Group_i to make sure <resolve> // works correctly. - Load_Balancer::Group_ID resolve (ACE_ENV_SINGLE_ARG_DECL) + char * resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns a member object from this <Object_Group> in accordance with diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp index 163bfcbb0c1..dbc3fd4b4ff 100644 --- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp @@ -265,8 +265,8 @@ Event_List_impl::store_event (Event* e ACE_ENV_ARG_DECL_NOT_USED) // guard against the access to the list from another thread. // But this is omitted in this example. - Event_List_Link_var new_link (ACE_static_cast (Event_List_Link*, - new Event_List_Link_impl (e))); + Event_List_Link_var new_link (ACE_static_cast(Event_List_Link*, + new Event_List_Link_impl (e))); // We need a new link to store the reference to the event e. // But if we'd had assigned the newly created instance directly through @@ -295,7 +295,7 @@ Event_List_impl::store_event (Event* e ACE_ENV_ARG_DECL_NOT_USED) else { last_link_cache_->attach_next_link (new_link); - last_link_cache_ = new_link.in (); + last_link_cache_ = new_link; } } diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp index 1cfb2213e9f..fb953ff8b78 100644 --- a/TAO/examples/POA/DSI/Database_i.cpp +++ b/TAO/examples/POA/DSI/Database_i.cpp @@ -149,7 +149,7 @@ DatabaseImpl::Agent::~Agent (void) Database::Entry_ptr DatabaseImpl::Agent::create_entry (const char *key, - const Database::Identifier entry_type, + const char *entry_type, const Database::NVPairSequence &initial_attributes ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, @@ -219,7 +219,7 @@ DatabaseImpl::Agent::create_entry (const char *key, Database::Entry_ptr DatabaseImpl::Agent::find_entry (const char *key, - const Database::Identifier entry_type + const char *entry_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, @@ -275,7 +275,7 @@ DatabaseImpl::Agent::find_entry (const char *key, void DatabaseImpl::Agent::destroy_entry (const char *key, - const Database::Identifier entry_type + const char *entry_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h index 4ed48fddd2a..25c120a7b0e 100644 --- a/TAO/examples/POA/DSI/Database_i.h +++ b/TAO/examples/POA/DSI/Database_i.h @@ -76,7 +76,7 @@ public: ~Agent (void); virtual Database::Entry_ptr create_entry (const char *key, - const Database::Identifier entry_type, + const char *entry_type, const Database::NVPairSequence &initial_attributes ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, @@ -84,14 +84,14 @@ public: Database::Duplicate_Key)); virtual Database::Entry_ptr find_entry (const char *key, - const Database::Identifier entry_type + const char *entry_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Not_Found)); virtual void destroy_entry (const char *key, - const Database::Identifier entry_type + const char *entry_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp index dc8578c49b8..dd15e2008f5 100644 --- a/TAO/examples/POA/DSI/client.cpp +++ b/TAO/examples/POA/DSI/client.cpp @@ -167,8 +167,7 @@ main (int argc, char **argv) // Create an employee Database::Entry_var entry = database_agent->create_entry ("irfan", - ACE_const_cast (const Database::Identifier, - "Employee"), + "Employee", employee_attributes ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -204,8 +203,7 @@ main (int argc, char **argv) ACE_OS::strcpy (str, "Database::Entry::destroy"); // Destroy the employee database_agent->destroy_entry ("irfan", - ACE_const_cast (const Database::Identifier, - "Employee") + "Employee" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 73a4eeb00fd..1d9a3966392 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -198,8 +198,7 @@ Activity::activate_job_list (ACE_ENV_SINGLE_ARG_DECL) const ACE_CString &job_name = job->name (); CosNaming::Name_var name = - this->naming_->to_name (ACE_const_cast (const CosNaming::NamingContextExt::StringName, - job_name.c_str ()) + this->naming_->to_name (job_name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp index fc5b618a4c4..8d2448ba833 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp @@ -26,10 +26,7 @@ ACE_RCSID(LifeCycle_Service, Factory_Trader, "$Id$") // This const char * is used for adding a new type to the service repository // the added types will be subclasses of this. -const CosTrading::ServiceTypeName -Factory_Trader::GENERIC_FACTORY_INTERFACE_REPOSITORY_ID = - ACE_const_cast (const CosTrading::ServiceTypeName, - "IDL:omg.org/CosLifeCycle/GenericFactory:1.0"); +const char * Factory_Trader::GENERIC_FACTORY_INTERFACE_REPOSITORY_ID = "IDL:omg.org/CosLifeCycle/GenericFactory:1.0"; Factory_Trader::Factory_Trader (int debug_level) @@ -166,7 +163,7 @@ Factory_Trader::_cxx_export (const char * name, CORBA::Object_ptr -Factory_Trader::query (const CosTrading::Constraint constraint) +Factory_Trader::query (const char* constraint) { ACE_TRY_NEW_ENV { @@ -186,11 +183,9 @@ Factory_Trader::query (const CosTrading::Constraint constraint) // this pointer is deleted when the trader_ptr is deleted // Invoke the query method on the Lookup Interface. - lookup_ptr->query (ACE_const_cast (const CosTrading::ServiceTypeName, - "GenericFactory"), // Type name + lookup_ptr->query ("GenericFactory", // Type name constraint, // Constraint, very important - ACE_const_cast (const CosTrading::Lookup::Preference, - ""), // Preferences + "", // Preferences policySeq, // Policy specifiedProps, // Specified Properties 1, // Number of wanted results diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h index 9a3b3d4281e..bba04656a87 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h @@ -38,10 +38,10 @@ public: const CORBA::Object_ptr object_ptr); // export a specific factory - CORBA::Object_ptr query (const CosTrading::Constraint constraint); + CORBA::Object_ptr query (const char* constraint); // query for a specific factory using a constraint - static const CosTrading::ServiceTypeName GENERIC_FACTORY_INTERFACE_REPOSITORY_ID; + static const char * GENERIC_FACTORY_INTERFACE_REPOSITORY_ID; private: TAO_Service_Type_Repository repository_; TAO_Trader_Factory::TAO_TRADER *trader_ptr_; diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp index 7a29cc7f065..f5c11d7cda3 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp @@ -93,8 +93,7 @@ Notify_Logging_Service::init (int argc, char *argv[] ACE_ASSERT (!CORBA::is_nil (this->naming_.in ())); CosNaming::Name_var name = - this->naming_->to_name (ACE_const_cast (const CosNaming::NamingContextExt::StringName, - this->notify_factory_name_.c_str ()) + this->naming_->to_name (this->notify_factory_name_.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -166,8 +165,7 @@ Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; CosNaming::Name_var name = - this->naming_->to_name (ACE_const_cast (const CosNaming::NamingContextExt::StringName, - this->notify_factory_name_.c_str ()) + this->naming_->to_name (this->notify_factory_name_.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp index f45e68ee408..ffa2953f1fa 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -173,8 +173,7 @@ TAO_Notify_Service::init (int argc, ACE_TCHAR *argv[] CORBA::string_dup (this->notify_factory_name_.c_str ()); #else CosNaming::Name_var name = - this->naming_->to_name (ACE_const_cast (const CosNaming::NamingContextExt::StringName, - this->notify_factory_name_.c_str ()) + this->naming_->to_name (this->notify_factory_name_.c_str () ACE_ENV_ARG_PARAMETER); #endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */ @@ -215,8 +214,7 @@ TAO_Notify_Service::init (int argc, ACE_TCHAR *argv[] CORBA::string_dup (this->notify_channel_name_.c_str ()); #else name = this->naming_->to_name ( - ACE_const_cast (const CosNaming::NamingContextExt::StringName, - this->notify_channel_name_.c_str ()) + this->notify_channel_name_.c_str () ACE_ENV_ARG_PARAMETER); #endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */ ACE_CHECK_RETURN (-1); @@ -322,8 +320,7 @@ TAO_Notify_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) CORBA::string_dup (this->notify_factory_name_.c_str ()); #else CosNaming::Name_var name = - this->naming_->to_name (ACE_const_cast (const CosNaming::NamingContextExt::StringName, - this->notify_factory_name_.c_str ()) + this->naming_->to_name (this->notify_factory_name_.c_str () ACE_ENV_ARG_PARAMETER); #endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile index 6218339dac6..13a9a2e6544 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile @@ -36,14 +36,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) $(IDL_SRC) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU -#### If the orbsvcs library wasn't built with all components, don't -#### try to build certain tests. -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS))) -ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # RTEvent -endif # CosEvent include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU diff --git a/TAO/orbsvcs/examples/Log/Basic/Client.dsp b/TAO/orbsvcs/examples/Log/Basic/Client.dsp index ab9de4084e5..4f7c37e56f3 100644 --- a/TAO/orbsvcs/examples/Log/Basic/Client.dsp +++ b/TAO/orbsvcs/examples/Log/Basic/Client.dsp @@ -41,15 +41,15 @@ RSC=rc.exe # PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "Client - Win32 Debug"
@@ -64,8 +64,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
@@ -73,8 +73,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib aced.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp index db1b5623098..c5c3e6d11a1 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp @@ -150,10 +150,7 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "Querying the Log: %s\n", QUERY_1)); DsLogAdmin::Iterator_var iter_out; DsLogAdmin::RecordList_var rec_list = - basic_log->query (QUERY_LANG, - ACE_const_cast (const DsLogAdmin::Constraint, - QUERY_10, - iter_out); + basic_log->query (QUERY_LANG, QUERY_1, iter_out); CORBA::ULong j = 0; for (; j < rec_list->length();++j) //dhanvey added info @@ -171,10 +168,7 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "Deleting records... \n")); - retval = basic_log->delete_records (QUERY_LANG, - ACE_const_cast (const DsLogAdmin::Constraint, - QUERY_2) - ACE_ENV_ARG_PARAMETER); + retval = basic_log->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp index 04130041643..46fa820d1b9 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -157,10 +157,7 @@ Supplier::run (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "Querying the Log: %s\n", QUERY_1)); DsLogAdmin::Iterator_var iter_out; DsLogAdmin::RecordList_var rec_list = - event_log->query (QUERY_LANG, - ACE_const_cast (const DsLogAdmin::Constraint, - QUERY_1), - iter_out); + event_log->query (QUERY_LANG, QUERY_1, iter_out); CORBA::ULong j = 0; for (; j < rec_list->length();++j) @@ -177,10 +174,7 @@ Supplier::run (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "Deleting records... \n")); - retval = event_log->delete_records (QUERY_LANG, - ACE_const_cast (const DsLogAdmin::Constraint, - QUERY_2) - ACE_ENV_ARG_PARAMETER); + retval = event_log->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Consumer.dsp b/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Consumer.dsp index c8482361cec..81ff14b7c05 100644 --- a/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Consumer.dsp +++ b/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Consumer.dsp @@ -41,15 +41,15 @@ RSC=rc.exe # PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "Log_CEC_Simple_Consumer - Win32 Debug"
@@ -64,8 +64,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\Log_CEC_Simple_Consumer"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
@@ -73,8 +73,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Supplier.dsp b/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Supplier.dsp index 40f2f2e3448..2dd3f7dcd81 100644 --- a/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Supplier.dsp +++ b/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Supplier.dsp @@ -41,15 +41,15 @@ RSC=rc.exe # PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "Log_CEC_Simple_Supplier - Win32 Debug"
@@ -64,8 +64,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\Log_CEC_Simple_Supplier"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
@@ -73,8 +73,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Consumer.dsp b/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Consumer.dsp index aa19102b02e..8c4a1d75d78 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Consumer.dsp +++ b/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Consumer.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "Log_Notify_Simple_Consumer - Win32 Debug"
@@ -64,8 +64,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\Log_Notify_Simple_Consumer"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
@@ -74,7 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAO_CosEventd.lib TAO_CosNotificationd.lib TAO_DsNotifyLogAdmind.lib TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_CosEventd.lib TAO_CosNotificationd.lib TAO_DsNotifyLogAdmind.lib TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Supplier.dsp b/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Supplier.dsp index f681c3c4e6e..eeafe2d9c5b 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Supplier.dsp +++ b/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Supplier.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "Log_Notify_Simple_Supplier - Win32 Debug"
@@ -64,8 +64,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\Log_Notify_Simple_Supplier"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
@@ -74,7 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAO_CosEventd.lib TAO_CosNotificationd.lib TAO_DsNotifyLogAdmind.lib TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_CosEventd.lib TAO_CosNotificationd.lib TAO_DsNotifyLogAdmind.lib TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index ab7bb135705..f03c0be4389 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -228,10 +228,7 @@ Supplier::run (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "Querying the Log: %s\n", QUERY_1)); DsLogAdmin::Iterator_var iter_out; DsLogAdmin::RecordList_var rec_list = - notify_log_->query (QUERY_LANG, - ACE_const_cast (const DsLogAdmin::Constraint, - QUERY_1), - iter_out); + notify_log_->query (QUERY_LANG, QUERY_1, iter_out); CORBA::ULong j = 0; for (; j < rec_list->length();++j) @@ -248,10 +245,7 @@ Supplier::run (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "Deleting records... \n")); - retval = notify_log_->delete_records (QUERY_LANG, - ACE_const_cast (const DsLogAdmin::Constraint, - QUERY_2) - ACE_ENV_ARG_PARAMETER); + retval = notify_log_->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Consumer.dsp b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Consumer.dsp index dd1f5f16221..bac1b11caf0 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Consumer.dsp +++ b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Consumer.dsp @@ -41,15 +41,15 @@ RSC=rc.exe # PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "Log_RTEvent_Simple_Consumer - Win32 Debug"
@@ -64,8 +64,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\Log_RTEvent_Simple_Consumer"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
@@ -73,8 +73,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAO_RTEventd.lib TAO_RTEventLogd.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAO_RTEventd.lib TAO_RTEventLogd.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Supplier.dsp b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Supplier.dsp index 6e7a10d4c74..b580fcf35a8 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Supplier.dsp +++ b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Supplier.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "Log_RTEvent_Simple_Supplier - Win32 Debug"
@@ -64,8 +64,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\Log_RTEvent_Simple_Supplier"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FR /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
@@ -74,7 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAO_RTEventd.lib TAO_RTEventLogd.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_RTEventd.lib TAO_RTEventLogd.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index 4a6904482f8..d3494027503 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -213,10 +213,7 @@ Supplier::run (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "Querying the Log: %s\n", QUERY_1)); DsLogAdmin::Iterator_var iter_out; DsLogAdmin::RecordList_var rec_list = - event_log->query (QUERY_LANG, - ACE_const_cast (const DsLogAdmin::Constraint, - QUERY_1), - iter_out); + event_log->query (QUERY_LANG, QUERY_1, iter_out); CORBA::ULong j = 0; for (; j < rec_list->length();++j) @@ -233,10 +230,7 @@ Supplier::run (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "Deleting records... \n")); - retval = event_log->delete_records (QUERY_LANG, - ACE_const_cast (const DsLogAdmin::Constraint, - QUERY_2) - ACE_ENV_ARG_PARAMETER); + retval = event_log->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index e1e87e2a927..c4b1bc9f7f2 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -661,24 +661,21 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, // Define ourselves as the related_streamctrl property of the sep. CORBA::Any streamctrl_any; streamctrl_any <<= this->streamctrl_.in (); - this->sep_a_->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_StreamCtrl"), + this->sep_a_->define_property ("Related_StreamCtrl", streamctrl_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any vdev_a_any; vdev_a_any <<= this->vdev_a_.in (); - this->sep_a_->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_VDev"), + this->sep_a_->define_property ("Related_VDev", vdev_a_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any streamendpoint_a_any; streamendpoint_a_any <<= this->sep_a_.in (); - this->vdev_a_->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_StreamEndpoint"), + this->vdev_a_->define_property ("Related_StreamEndpoint", streamendpoint_a_any ACE_ENV_ARG_PARAMETER); @@ -686,8 +683,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, CORBA::Any mmdevice_a_any; mmdevice_a_any <<= a_party; - this->vdev_a_->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_MMDevice"), + this->vdev_a_->define_property ("Related_MMDevice", mmdevice_a_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -741,24 +737,21 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, // Define ourselves as the related_streamctrl property of the sep. CORBA::Any streamctrl_any; streamctrl_any <<= this->streamctrl_.in (); - this->sep_b_->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_StreamCtrl"), + this->sep_b_->define_property ("Related_StreamCtrl", streamctrl_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any vdev_b_any; vdev_b_any <<= this->vdev_b_.in (); - this->sep_b_->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_VDev"), + this->sep_b_->define_property ("Related_VDev", vdev_b_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any streamendpoint_b_any; streamendpoint_b_any <<= this->sep_b_.in (); - this->vdev_b_->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_StreamEndpoint"), + this->vdev_b_->define_property ("Related_StreamEndpoint", streamendpoint_b_any ACE_ENV_ARG_PARAMETER); @@ -766,8 +759,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, CORBA::Any mmdevice_b_any; mmdevice_b_any <<= b_party; - this->vdev_b_->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_MMDevice"), + this->vdev_b_->define_property ("Related_MMDevice", mmdevice_b_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -793,14 +785,12 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, sep_a_peer_any <<= this->sep_b_.in(); sep_b_peer_any <<= this->sep_a_.in(); - this->sep_a_->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "PeerAdapter"), + this->sep_a_->define_property ("PeerAdapter", sep_a_peer_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->sep_b_->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "PeerAdapter"), + this->sep_b_->define_property ("PeerAdapter", sep_b_peer_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -814,10 +804,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, // instead. ACE_TRY_EX (set_source_id) { - CORBA::Any_ptr flows_any = - this->sep_a_->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Flows") - ACE_ENV_ARG_PARAMETER); + CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows" + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (set_source_id); AVStreams::flowSpec_var flows; *flows_any >>= flows.out (); @@ -934,33 +922,32 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, // If it contains FDev objects, then we are using the // Full profile, and we want to call bind() instead // of connect() on the the streamctrl - if (a_party->is_property_defined (ACE_const_cast (const CosPropertyService::PropertyName, - "Flows")) && - b_party->is_property_defined (ACE_const_cast (const CosPropertyService::PropertyName, - "Flows"))) - { - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, "(%N,%l) Full profile, invoking bind()\n")); - } + if( a_party->is_property_defined("Flows") && + b_party->is_property_defined("Flows") ) + { + if (TAO_debug_level > 0) { + ACE_DEBUG ((LM_DEBUG, "(%N,%l) Full profile, invoking bind()\n")); + } // It is full profile // we have feps in the sep then dont call connect - // instead call bind on the streamctrl. + // instead call bind on the streamctrl. this->bind (this->sep_a_.in (), this->sep_b_.in (), the_qos, the_flows ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - } - // This is the light profile, call connect() - else if (!CORBA::is_nil (this->vdev_a_.in ()) && !CORBA::is_nil (this->vdev_b_.in ())) + + + + } + // This is the light profile, call connect() + else if (!CORBA::is_nil (this->vdev_a_.in ()) && !CORBA::is_nil (this->vdev_b_.in ())) { - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, "(%N,%l) Light profile, invoking connect()\n")); - } + if (TAO_debug_level > 0) { + ACE_DEBUG ((LM_DEBUG, "(%N,%l) Light profile, invoking connect()\n")); + } // Tell the 2 VDev's about one another this->vdev_a_->set_peer (this->streamctrl_.in (), @@ -988,7 +975,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, ACE_TRY_CHECK; if (result == 0) ACE_ERROR_RETURN ((LM_ERROR, "sep_a->connect (sep_b) failed\n"), 0); - } + } } } ACE_CATCHANY @@ -1030,32 +1017,26 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, // Define each other as their peers. CORBA::Any sep_any; sep_any <<= sep_b; - sep_a_->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "PeerAdapter"), - sep_any - ACE_ENV_ARG_PARAMETER); + sep_a_->define_property ("PeerAdapter", + sep_any + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sep_any <<= sep_a; - sep_b_->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "PeerAdapter"), - sep_any - ACE_ENV_ARG_PARAMETER); + sep_b_->define_property ("PeerAdapter", + sep_any + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // since its full profile we do the viable stream setup algorithm. // get the flows for the A streamendpoint. // the flows spec is empty and hence we do a exhaustive match. AVStreams::flowSpec a_flows, b_flows; CORBA::Any_var flows_any; - flows_any = sep_a_->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Flows") - ACE_ENV_ARG_PARAMETER); + flows_any = sep_a_->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::flowSpec *temp_flows; flows_any.in () >>= temp_flows; a_flows = *temp_flows; - flows_any = sep_b_->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Flows") - ACE_ENV_ARG_PARAMETER); + flows_any = sep_b_->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; flows_any.in () >>= temp_flows; b_flows = *temp_flows; @@ -1194,8 +1175,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, // can use either of them. CORBA::Object_var flow_connection_obj; CORBA::Any_var flowname_any = - fep_a->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "FlowName") + fep_a->get_property_value ("FlowName" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); const char *flowname = 0; @@ -1275,17 +1255,13 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, ACE_ENDTRY; ACE_CHECK_RETURN (0); CORBA::String_var fep_a_name, fep_b_name; - flowname_any = - fep_a->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "FlowName") - ACE_ENV_ARG_PARAMETER); + flowname_any = fep_a->get_property_value ("FlowName" + ACE_ENV_ARG_PARAMETER); const char *temp_name; flowname_any.in () >>= temp_name; fep_a_name = CORBA::string_dup (temp_name); - flowname_any = - fep_b->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "FlowName") - ACE_ENV_ARG_PARAMETER); + flowname_any = fep_b->get_property_value ("FlowName" + ACE_ENV_ARG_PARAMETER); flowname_any.in () >>= temp_name; fep_b_name = CORBA::string_dup (temp_name); AVStreams::QoS flow_qos; @@ -1816,11 +1792,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, ACE_DEBUG ((LM_DEBUG, "NEGOTIATOR AVIALABLE\n")); - CORBA::Any_var negotiator_any = - responder->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Negotiator") - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (negotiate); + CORBA::Any_var negotiator_any = responder->get_property_value ("Negotiator"); AVStreams::Negotiator_ptr peer_negotiator; negotiator_any.in () >>= peer_negotiator; @@ -1850,9 +1822,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, { // choose protocols based on what the remote endpoint can support. CORBA::Any_var protocols_any = - responder->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "AvailableProtocols") - ACE_ENV_ARG_PARAMETER); + responder->get_property_value ("AvailableProtocols" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (available_protocols); AVStreams::protocolSpec peer_protocols; AVStreams::protocolSpec *temp_protocols; @@ -2153,16 +2123,14 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { - CORBA::Any_var vdev_any = this->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_VDev") + CORBA::Any_var vdev_any = this->get_property_value ("Related_VDev" ACE_ENV_ARG_PARAMETER); AVStreams::VDev_ptr vdev; vdev_any.in() >>= vdev; - CORBA::Any_var mc_any = vdev->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_MediaCtrl") - ACE_ENV_ARG_PARAMETER); + CORBA::Any_var mc_any = vdev->get_property_value ("Related_MediaCtrl" + ACE_ENV_ARG_PARAMETER); // The Related_MediaCtrl property was inserted as a CORBA::Object, so we // must extract it as the same type. @@ -2443,8 +2411,7 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro CORBA::Any protocol_restriction_any; protocol_restriction_any <<= protocols; - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "ProtocolRestriction"), + this->define_property ("ProtocolRestriction", protocol_restriction_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -2523,8 +2490,7 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep CORBA::Any flowname_any; flowname_any <<= flow_name.c_str (); - fep->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Flow"), + fep->define_property ("Flow", flowname_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -2550,9 +2516,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep ACE_TRY { CORBA::Any_var flow_name_any = - fep->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "FlowName") - ACE_ENV_ARG_PARAMETER); + fep->get_property_value ("FlowName" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; const char *tmp; @@ -2602,8 +2566,7 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj // define/modify the "Flows" property. CORBA::Any flows_any; flows_any <<= this->flows_; - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Flows"), + this->define_property ("Flows", flows_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -2641,8 +2604,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name CORBA::Any flows; flows <<= new_flows; this->flows_ = new_flows; - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Flows"), + this->define_property ("Flows", flows ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -2665,8 +2627,7 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator { CORBA::Any negotiator; negotiator <<= new_negotiator; - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Negotiator"), + this->define_property ("Negotiator", negotiator ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -2822,8 +2783,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, if (CORBA::is_nil (this->streamctrl_.in ())) { CORBA::Any_var streamctrl_any; - streamctrl_any = this->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_StreamCtrl") + streamctrl_any = this->get_property_value ("Related_StreamCtrl" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::StreamCtrl_ptr streamctrl; @@ -3057,8 +3017,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, if (CORBA::is_nil (this->streamctrl_.in ())) { CORBA::Any_var streamctrl_any; - streamctrl_any = this->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_StreamCtrl") + streamctrl_any = this->get_property_value ("Related_StreamCtrl" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::StreamCtrl_ptr streamctrl; @@ -3182,8 +3141,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, CORBA::Any anyval; anyval <<= the_peer_dev; - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_VDev"), + this->define_property ("Related_VDev", anyval ACE_ENV_ARG_PARAMETER); @@ -3193,8 +3151,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, this->peer_ = AVStreams::VDev::_duplicate (the_peer_dev); CORBA::Any_var anyptr; - anyptr = this->peer_->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_MediaCtrl") + anyptr = this->peer_->get_property_value ("Related_MediaCtrl" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -3340,8 +3297,7 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, AVStreams::StreamEndPoint_A_ptr sep_a; CORBA::Any_ptr streamendpoint_a_any = - this->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_StreamEndpoint") + this->get_property_value ("Related_StreamEndpoint" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -3359,8 +3315,7 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, AVStreams::StreamEndPoint_B_ptr sep_b; CORBA::Any_ptr streamendpoint_b_any = - this->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Related_StreamEndpoint") + this->get_property_value ("Related_StreamEndpoint" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); *streamendpoint_b_any >>= sep_b; @@ -3623,10 +3578,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, } CORBA::Any flowname_any; flowname_any <<= forward_entry.flowname (); - flow_endpoint->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "FlowName"), - flowname_any - ACE_ENV_ARG_PARAMETER); + flow_endpoint->define_property ("FlowName", flowname_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sep->add_fep (flow_endpoint.in () ACE_ENV_ARG_PARAMETER); @@ -3755,10 +3707,7 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev ACE_OS::sprintf (tmp, "flow%d", flow_num_++); CORBA::Any flowname_any; flowname_any <<= flow_name.in (); - fdev->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Flow"), - flowname_any - ACE_ENV_ARG_PARAMETER); + fdev->define_property ("Flow", flowname_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3790,9 +3739,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj return 0; - flow_name_any = fdev->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Flow") - ACE_ENV_ARG_PARAMETER); + flow_name_any = fdev->get_property_value ("Flow" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_name); const char *tmp; @@ -3825,8 +3772,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj flows_any <<= this->flows_; ACE_TRY_EX (flows) { - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Flows"), + this->define_property ("Flows", flows_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flows); @@ -3882,8 +3828,7 @@ TAO_MMDevice::remove_fdev (const char *flow_name CORBA::Any flows; flows <<= new_flows; this->flows_ = new_flows; - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Flows"), + this->define_property ("Flows", flows ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -4482,8 +4427,7 @@ TAO_FlowEndPoint::open (const char *flowname, { CORBA::Any flowname_any; flowname_any <<= flowname; - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "FlowName"), + this->define_property ("FlowName", flowname_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -4613,8 +4557,7 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name, // Define the property called FlowProtocol CORBA::Any flowname_property; flowname_property <<= fp_name; - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "FlowProtocol"), + this->define_property ("FlowProtocol", flowname_property ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -4642,8 +4585,7 @@ TAO_FlowEndPoint::set_format (const char * format // check if 2 flowendpoints are compatible. CORBA::Any format_val; format_val <<= format; - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "Format"), + this->define_property ("Format", format_val ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -4668,8 +4610,7 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set { CORBA::Any DevParams_property; DevParams_property <<= new_settings; - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "DevParams"), + this->define_property ("DevParams", DevParams_property ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -4699,14 +4640,12 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot } CORBA::Any AvailableProtocols_property; AvailableProtocols_property <<= protocols; - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "AvailableProtocols"), + this->define_property ("AvailableProtocols", AvailableProtocols_property ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::protocolSpec *temp_spec; - CORBA::Any_var temp_any = this->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "AvailableProtocols") + CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; temp_any.in () >>= temp_spec; @@ -4743,8 +4682,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep CORBA::String_var my_format, peer_format; exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format"; - format_ptr = this->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Format") + format_ptr = this->get_property_value ("Format" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -4753,8 +4691,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep my_format = CORBA::string_dup (temp_format); // get my peer's format value exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format[2]"; - format_ptr = peer_fep->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "Format") + format_ptr = peer_fep->get_property_value ("Format" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; format_ptr.in () >>= temp_format; @@ -4770,8 +4707,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep exception_message = "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols"; - AvailableProtocols_ptr = this->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "AvailableProtocols") + AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AvailableProtocols_ptr.in () >>= temp_protocols; @@ -4779,8 +4715,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep exception_message = "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols[2]"; - AvailableProtocols_ptr = peer_fep->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "AvailableProtocols") + AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AvailableProtocols_ptr.in () >>= temp_protocols; @@ -4876,15 +4811,13 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role, AVStreams::protocolSpec my_protocol_spec, peer_protocol_spec; AVStreams::protocolSpec *temp_protocols; CORBA::Any_var AvailableProtocols_ptr = - peer_fep->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "AvailableProtocols") + peer_fep->get_property_value ("AvailableProtocols" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); AvailableProtocols_ptr.in () >>= temp_protocols; peer_protocol_spec = *temp_protocols; AvailableProtocols_ptr = - this->get_property_value (ACE_const_cast (const CosPropertyService::PropertyName, - "AvailableProtocols") + this->get_property_value ("AvailableProtocols" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); AvailableProtocols_ptr.in () >>= temp_protocols; @@ -5146,8 +5079,7 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key { CORBA::Any anyval; anyval <<= the_key; - this->define_property (ACE_const_cast (const CosPropertyService::PropertyName, - "PublicKey"), + this->define_property ("PublicKey", anyval ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index 32e0a28e923..556c4962320 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -146,8 +146,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ ACE_TRY_CHECK; - this->vdev_->define_property (ACE_const_cast (CosPropertyService::PropertyName, - "Related_MediaCtrl", + this->vdev_->define_property ("Related_MediaCtrl", anyval ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index 3a6b64f31ea..86cef7e0568 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -26,8 +26,7 @@ TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (const char *flowname) { CORBA::Any flowname_any; flowname_any <<= flowname; - this->define_property (ACE_const_cast (CosPropertyService::PropertyName, - "Flow"), + this->define_property ("Flow", flowname_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -62,8 +61,7 @@ TAO_FDev<T_Producer, T_Consumer>::flowname (const char *flow_name) { CORBA::Any flowname_any; flowname_any <<= flow_name; - this->define_property (ACE_const_cast (CosPropertyService::PropertyName, - "Flow"), + this->define_property ("Flow", flowname_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp index 0e3cb087a18..d3353325465 100644 --- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp +++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp @@ -40,10 +40,9 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DSEVENTLOGADMIN_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DSEVENTLOGADMIN_EXPORTS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DSEVENTLOGADMIN_EXPORTS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -54,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib TAO_DsLogAdmin.lib TAO_CosEvent.lib /nologo /dll /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
!ELSEIF "$(CFG)" == "DsEventLogAdmin - Win32 Debug"
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp index d8d1f9c97cc..14bbd9f5968 100644 --- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp +++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp @@ -40,10 +40,9 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DSNOTIFYLOGADMIN_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DSNOTIFYLOGADMIN_EXPORTS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DSNOTIFYLOGADMIN_EXPORTS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -54,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 TAO_CosNaming.lib TAO.lib ace.lib TAO_PortableServer.lib TAO_DsLogAdmin.lib TAO_DsEventLogAdmin.lib TAO_CosNotification.lib TAO_CosEvent.lib /nologo /dll /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
!ELSEIF "$(CFG)" == "DsNotifyLogAdmin - Win32 Debug"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h index 9b580a58294..59bb6b187fa 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h @@ -67,7 +67,7 @@ class TAO_LB_ObjectReferenceFactory */ //@{ virtual CORBA::Object_ptr make_object ( - const char *repository_id, + const char * repository_id, const PortableInterceptor::ObjectId & id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -95,7 +95,7 @@ protected: /// Retrieve the object group reference for objects with the given /// RepositoryId. - CORBA::Boolean find_object_group (const PortableGroup::TypeId repository_id, + CORBA::Boolean find_object_group (const char * repository_id, CORBA::ULong & index, PortableGroup::ObjectGroup_out object_group ACE_ENV_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index d09af807b95..482fc25f02c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -55,7 +55,7 @@ TAO_PG_GenericFactory::~TAO_PG_GenericFactory (void) CORBA::Object_ptr TAO_PG_GenericFactory::create_object ( - const PortableGroup::GroupDomainId type_id, + const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id ACE_ENV_ARG_DECL) @@ -306,7 +306,7 @@ TAO_PG_GenericFactory::populate_object_group ( const CORBA::ULong fcid, PortableGroup::ObjectGroup_ptr object_group, const PortableServer::ObjectId & oid, - const PortableGroup::GroupDomainId type_id, + const char * type_id, const PortableGroup::FactoryInfos & factory_infos, const PortableGroup::InitialNumberMembersValue initial_number_members, TAO_PG_Factory_Set & factory_set @@ -454,7 +454,7 @@ TAO_PG_GenericFactory::get_ObjectId ( void TAO_PG_GenericFactory::process_criteria ( - const PortableGroup::GroupDomainId type_id, + const char * type_id, const PortableGroup::Criteria & criteria, PortableGroup::MembershipStyleValue & membership_style, PortableGroup::FactoriesValue *& factory_infos, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index 78773e007c9..d1289d2c0e4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -69,7 +69,7 @@ public: * method to delete the object. */ virtual CORBA::Object_ptr create_object ( - const PortableGroup::GroupDomainId type_id, + const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id @@ -120,7 +120,7 @@ private: const CORBA::ULong fcid, PortableGroup::ObjectGroup_ptr object_group, const PortableServer::ObjectId & oid, - const PortableGroup::GroupDomainId type_id, + const char * type_id, const PortableGroup::FactoryInfos &factory_infos, const PortableGroup::InitialNumberMembersValue initial_number_members, TAO_PG_Factory_Set & factory_set @@ -148,7 +148,7 @@ private: * they are the object group creation time criteria. */ void process_criteria ( - const PortableGroup::GroupDomainId type_id, + const char * type_id, const PortableGroup::Criteria & criteria, PortableGroup::MembershipStyleValue & membership_style, PortableGroup::FactoriesValue *& factory_infos, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index 004e2faed34..9267b475d6d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -46,7 +46,7 @@ PortableGroup::ObjectGroup_ptr TAO_PG_ObjectGroupManager::create_member ( PortableGroup::ObjectGroup_ptr /* object_group */, const PortableGroup::Location & /* the_location */, - const PortableGroup::TypeId /* type_id */, + const char * /* type_id */, const PortableGroup::Criteria & /* the_criteria */ ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, @@ -337,7 +337,7 @@ PortableGroup::ObjectGroup_ptr TAO_PG_ObjectGroupManager::create_object_group ( CORBA::ULong group_id, const PortableServer::ObjectId &oid, - const PortableGroup::TypeId type_id, + const char * type_id, const PortableGroup::Criteria & the_criteria ACE_ENV_ARG_DECL) { @@ -404,7 +404,7 @@ TAO_PG_ObjectGroupManager::destroy_object_group ( delete group_entry; } -PortableGroup::TypeId +char * TAO_PG_ObjectGroupManager::type_id ( PortableGroup::ObjectGroup_ptr object_group ACE_ENV_ARG_DECL) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index 0cd0fd52fc5..9802a020b67 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -60,7 +60,7 @@ public: virtual PortableGroup::ObjectGroup_ptr create_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, - const PortableGroup::TypeId type_id, + const char * type_id, const PortableGroup::Criteria & the_criteria ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, @@ -140,7 +140,7 @@ public: PortableGroup::ObjectGroup_ptr create_object_group ( CORBA::ULong group_id, const PortableServer::ObjectId &oid, - const PortableGroup::TypeId type_id, + const char * type_id, const PortableGroup::Criteria & the_criteria ACE_ENV_ARG_DECL); @@ -161,8 +161,8 @@ public: PortableGroup::ObjectGroupNotFound)); /// Return the type_id for the given object group. - PortableGroup::TypeId type_id (PortableGroup::ObjectGroup_ptr object_group - ACE_ENV_ARG_DECL); + char * type_id (PortableGroup::ObjectGroup_ptr object_group + ACE_ENV_ARG_DECL); /// Return the object group associated with the given ObjectId. /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp index db39017f656..67997d65266 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp @@ -98,7 +98,7 @@ TAO_PG_PropertyManager::remove_default_properties ( void TAO_PG_PropertyManager::set_type_properties ( - const PortableGroup::TypeId type_id, + const char * type_id, const PortableGroup::Properties & overrides ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, @@ -127,7 +127,7 @@ TAO_PG_PropertyManager::set_type_properties ( PortableGroup::Properties * TAO_PG_PropertyManager::get_type_properties ( - const PortableGroup::TypeId type_id + const char * type_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -175,7 +175,7 @@ TAO_PG_PropertyManager::get_type_properties ( void TAO_PG_PropertyManager::remove_type_properties ( - const PortableGroup::TypeId type_id, + const char * type_id, const PortableGroup::Properties & props ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index 8c6b5ca1a20..7043389256d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -87,7 +87,7 @@ public: /// Set properties associated with a given Member type. These /// properties override the default properties. virtual void set_type_properties ( - const PortableGroup::TypeId type_id, + const char * type_id, const PortableGroup::Properties & overrides ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, @@ -100,13 +100,13 @@ public: * addition to the default properties that were not overridden. */ virtual PortableGroup::Properties * get_type_properties ( - const PortableGroup::TypeId type_id + const char * type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Remove the given properties associated with the Replica type ID. virtual void remove_type_properties ( - const PortableGroup::TypeId type_id, + const char * type_id, const PortableGroup::Properties & props ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp index d36dd0c26ce..7f59e17ed6a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp @@ -436,8 +436,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname, { // Get the stream controller for this endpoint. CORBA::Any_var streamctrl_any = - endpoint->get_property_value (ACE_const_cast (CosPropertyService::PropertyName, - "Related_StreamCtrl") + endpoint->get_property_value ("Related_StreamCtrl" ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp index 82ce568c1af..c5e61528048 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp @@ -439,8 +439,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname, { // Get the stream controller for this endpoint. CORBA::Any_var streamctrl_any = - endpoint->get_property_value (ACE_const_cast (CosPropertyService::PropertyName, - "Related_StreamCtrl") + endpoint->get_property_value ("Related_StreamCtrl" ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp index 9771d3a6410..cd5008b2fd7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp @@ -20,8 +20,7 @@ Sender_StreamEndPoint::get_callback (const char *, ACE_TRY_NEW_ENV { CORBA::Any_ptr streamctrl_any = - this->get_property_value (ACE_const_cast (CosPropertyService::PropertyName, - "Related_StreamCtrl" + this->get_property_value ("Related_StreamCtrl" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp index abfcdcf8219..02ed8e5d823 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp @@ -170,11 +170,8 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL) { // Resolve the name using the stringified form of the name factory_object = - this->naming_context_->resolve_str ( - ACE_const_cast (const CosNaming::NamingContextExt::StringName, - str_name.in ()) - ACE_ENV_ARG_PARAMETER - ); + this->naming_context_->resolve_str (str_name.in () + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (InnerBlock); } ACE_CATCH (CosNaming::NamingContext::NotFound, ex) @@ -184,8 +181,7 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL) // Narrow Web_Server::Iterator_Factory_var factory = - Web_Server::Iterator_Factory::_narrow (factory_object.in () - ACE_ENV_ARG_PARAMETER); + Web_Server::Iterator_Factory::_narrow (factory_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (OuterBlock); @@ -202,11 +198,8 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL) // Convert the stringified name back as CosNaming::Name and print // them out. CosNaming::Name *nam = - this->naming_context_->to_name ( - ACE_const_cast (const CosNaming::NamingContextExt::StringName, - str_name.in ()) - ACE_ENV_ARG_PARAMETER - ); + this->naming_context_->to_name (str_name.in () + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (OuterBlock); // Declare a CosNaming::Name variable and assign length to it. @@ -230,13 +223,9 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL) CORBA::String_var obj_name = get_name (); CORBA::String_var url_string = - this->naming_context_->to_url ( - ACE_const_cast (const CosNaming::NamingContextExt::Address, - address.in ()), - ACE_const_cast (const CosNaming::NamingContextExt::StringName, - obj_name.in ()) - ACE_ENV_ARG_PARAMETER - ); + this->naming_context_->to_url (address.in (), + obj_name.in() + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (OuterBlock); if (this->view_ == 0) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp index 34ab1f6fafa..ae8a7fc7dd9 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp @@ -139,7 +139,7 @@ LB_server::create_object_group (void) { ACE_TRY_NEW_ENV { - const PortableGroup::GroupDomainId repository_id = "IDL:Test/Basic:1.0"; + const char *repository_id = "IDL:Test/Basic:1.0"; PortableGroup::Criteria criteria (1); criteria.length (1); @@ -154,12 +154,10 @@ LB_server::create_object_group (void) PortableGroup::MEMB_APP_CTRL; property.val <<= msv; - this->object_group_ = - this->lm_->create_object (ACE_const_cast (PortableGroup::TypeId, - repository_id), - criteria, - this->fcid_.out () - ACE_ENV_ARG_PARAMETER); + this->object_group_ = this->lm_->create_object (repository_id, + criteria, + this->fcid_.out () + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index 3fe1b3b75f9..8cef9e7e9e5 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -697,10 +697,7 @@ int BasicLog_Test::delete_records (CORBA::ULongLong /* numberOfRecords */) ACE_U64_TO_U32 (nrecords))); CORBA::Long retVal = - basicLog_->delete_records ("TCL", - ACE_const_cast (const DsLogAdmin::Constraint, - "id >= 0") - ACE_ENV_ARG_PARAMETER); + basicLog_->delete_records ("TCL", "id >= 0" ACE_ENV_ARG_PARAMETER); ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d\n", diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index 829abd81a1d..88e2b054e22 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -141,8 +141,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL) ch = '*'; anyval >>= CORBA::Any::to_char (ch); - this->propsetdef_->define_property (ACE_const_cast (CosPropertyService::PropertyName, - "char_property"), + this->propsetdef_->define_property ("char_property", anyval ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -153,8 +152,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL) s = 7; anyval >>= s; - propsetdef_->define_property (ACE_const_cast (CosPropertyService::PropertyName, - "short_property"), + propsetdef_->define_property ("short_property", anyval ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -165,8 +163,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL) l = 931233; anyval >>= l; CORBA::Any newany(anyval); - propsetdef_->define_property (ACE_const_cast (CosPropertyService::PropertyName, - "long_property"), + propsetdef_->define_property ("long_property", anyval ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -177,8 +174,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL) f = 4.14F; anyval >>= f; - propsetdef_->define_property (ACE_const_cast (CosPropertyService::PropertyName, - "float_property"), + propsetdef_->define_property ("float_property", anyval ACE_ENV_ARG_PARAMETER); @@ -189,8 +185,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL) anyval <<= strvar.in (); const char * newstr; anyval >>= newstr; - propsetdef_->define_property (ACE_const_cast (CosPropertyService::PropertyName, - "string_property"), + propsetdef_->define_property ("string_property", anyval ACE_ENV_ARG_PARAMETER); @@ -398,11 +393,8 @@ Client::test_delete_property (const char *property_name { CORBA::String_var property_name_var (property_name); - this->propsetdef_->delete_property ( - ACE_const_cast (CosPropertyService::PropertyName, - property_name_var.in ()) - ACE_ENV_ARG_PARAMETER - ); + this->propsetdef_->delete_property (property_name_var.in () + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ex) @@ -644,8 +636,7 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL) ch = '*'; anyval >>= CORBA::Any::to_char (ch); - this->propsetdef_->define_property_with_mode (ACE_const_cast (CosPropertyService::PropertyName, - "char_property"), + this->propsetdef_->define_property_with_mode ("char_property", anyval, CosPropertyService::normal ACE_ENV_ARG_PARAMETER); @@ -657,8 +648,7 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL) s = 7; anyval >>= s; - propsetdef_->define_property_with_mode (ACE_const_cast (CosPropertyService::PropertyName, - "short_property"), + propsetdef_->define_property_with_mode ("short_property", anyval, CosPropertyService::read_only ACE_ENV_ARG_PARAMETER); @@ -682,8 +672,7 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL) anyval <<= f; f = 4.14F; anyval >>= f; - propsetdef_->define_property_with_mode (ACE_const_cast (CosPropertyService::PropertyName, - "float_property"), + propsetdef_->define_property_with_mode ("float_property", anyval, CosPropertyService::fixed_readonly ACE_ENV_ARG_PARAMETER); @@ -695,8 +684,7 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL) const char* newstr; anyval >>= newstr; - propsetdef_->define_property (ACE_const_cast (CosPropertyService::PropertyName, - "string_property"), + propsetdef_->define_property ("string_property", anyval ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( -1); @@ -710,10 +698,8 @@ Client::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY { // Get the ior property. - CORBA::Any_ptr any_ptr = - this->propsetdef_->get_property_value (ACE_const_cast (CosPropertyService::PropertyName, - "PropertySetDef_IOR") - ACE_ENV_ARG_PARAMETER); + CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR" + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check whether the IOR is fine. diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index b66d0ad52a2..bcaeae71a5f 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -75,8 +75,7 @@ main (int argc, char ** argv) // ACE_ENV_ARG_PARAMETER); // ACE_TRY_CHECK; - propsetdef_impl->define_property_with_mode (ACE_const_cast (CosPropertyService::PropertyName, - "PropertySetDef_IOR"), + propsetdef_impl->define_property_with_mode ("PropertySetDef_IOR", any_val, CosPropertyService::fixed_readonly ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp index ee71d20c050..e4fa0e39cba 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp @@ -81,8 +81,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg CosTrading::OfferId_var offer_id = reg->_cxx_export (offer_obj, - ACE_const_cast (const CosTrading::ServiceTypeName, - TT_Info::INTERFACE_NAMES[1]), + TT_Info::INTERFACE_NAMES[1], this->props_plotters_[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -96,8 +95,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg ACE_TRY_CHECK; offer_id = reg->_cxx_export (offer_obj, - ACE_const_cast (const CosTrading::ServiceTypeName, - TT_Info::INTERFACE_NAMES[2]), + TT_Info::INTERFACE_NAMES[2], this->props_printers_[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -111,8 +109,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg ACE_TRY_CHECK; offer_id = reg->_cxx_export (offer_obj, - ACE_const_cast (const CosTrading::ServiceTypeName, - TT_Info::INTERFACE_NAMES[3]), + TT_Info::INTERFACE_NAMES[3], this->props_fs_[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK @@ -181,9 +178,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL) } CosTrading::Link::LinkInfo_var link_info = - link_if->describe_link (ACE_const_cast (const CosTrading::LinkName, - link_name_seq[i].in ()) - ACE_ENV_ARG_PARAMETER); + link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (int j = 0; j < NUM_OFFERS; j++) @@ -232,9 +227,7 @@ TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL) length = offer_id_seq->length (); for (CORBA::ULong i = 0; i < length; i++) { - this->register_->withdraw (ACE_const_cast (const CosTrading::OfferId, - offer_id_seq[i].in ()) - ACE_ENV_ARG_PARAMETER); + this->register_->withdraw (offer_id_seq[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -272,9 +265,7 @@ TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL) for (CORBA::ULong i = 0; i < length; i++) { CosTrading::Register::OfferInfo_var offer_info = - this->register_->describe (ACE_const_cast (const CosTrading::OfferId, - offer_id_seq[i].in ()) - ACE_ENV_ARG_PARAMETER); + this->register_->describe (offer_id_seq[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->verbose_) @@ -334,8 +325,7 @@ TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL) for (CORBA::ULong i = 0; i < length; i++) { - this->register_->modify (ACE_const_cast (const CosTrading::OfferId, - offer_id_seq[i].in ()), + this->register_->modify (offer_id_seq[i], del_list, modify_list ACE_ENV_ARG_PARAMETER); @@ -371,26 +361,20 @@ withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY { this->register_-> - withdraw_using_constraint (ACE_const_cast (const CosTrading::ServiceTypeName, - TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER]), - ACE_const_cast (const CosTrading::Constraint, - constraint) + withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER], + constraint ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->register_-> - withdraw_using_constraint (ACE_const_cast (const CosTrading::ServiceTypeName, - TT_Info::INTERFACE_NAMES[TT_Info::PRINTER]), - ACE_const_cast (const CosTrading::Constraint, - constraint) + withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PRINTER], + constraint ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->register_-> - withdraw_using_constraint (ACE_const_cast (const CosTrading::ServiceTypeName, - TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM]), - ACE_const_cast (const CosTrading::Constraint, - constraint) + withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM], + constraint ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp index 0f8ab540b42..8e367d0f0d8 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp @@ -83,9 +83,7 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL) } CosTrading::Link::LinkInfo_var link_info = - link_if->describe_link (ACE_const_cast (const CosTrading::LinkName, - link_name_seq[0u].in ()) - ACE_ENV_ARG_PARAMETER); + link_if->describe_link (link_name_seq[0u] ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosTrading::Lookup_ptr lookup_if = link_info->target.in (); @@ -183,12 +181,9 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies CosTrading::OfferIterator_out offer_iterator_out (offer_iterator_ptr); CosTrading::PolicyNameSeq_out limits_applied_out (limits_applied_ptr); - this->lookup_->query (ACE_const_cast (const CosTrading::ServiceTypeName, - TT_Info::QUERIES[i][0]), - ACE_const_cast (const CosTrading::Constraint, - TT_Info::QUERIES[i][1]), - ACE_const_cast (const CosTrading::Lookup::Preference, - TT_Info::QUERIES[i][2]), + this->lookup_->query (TT_Info::QUERIES[i][0], + TT_Info::QUERIES[i][1], + TT_Info::QUERIES[i][2], policies.policy_seq (), desired_props, 8, diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp index bd46a35e014..2a60d2a9798 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp @@ -39,9 +39,7 @@ TAO_Service_Type_Exporter::remove_all_types (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { - this->repos_->remove_type (ACE_const_cast (const CosTrading::ServiceTypeName, - TT_Info::INTERFACE_NAMES[i]) - ACE_ENV_ARG_PARAMETER); + this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosTrading::UnknownServiceType, excp) @@ -116,9 +114,7 @@ TAO_Service_Type_Exporter::add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n", ACE_static_cast (const char*, link_name_seq[i]))); CosTrading::Link::LinkInfo_var link_info = - link_if->describe_link (ACE_const_cast (const CosTrading::LinkName, - link_name_seq[i].in ()) - ACE_ENV_ARG_PARAMETER); + link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n", @@ -165,10 +161,8 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos { ACE_TRY { - repos->add_type (ACE_const_cast (const CosTrading::ServiceTypeName, - TT_Info::INTERFACE_NAMES[i]), - ACE_const_cast (const CosTradingRepos::ServiceTypeRepository::Identifier, - this->type_structs_[i].if_name.in ()), + repos->add_type (TT_Info::INTERFACE_NAMES[i], + this->type_structs_[i].if_name, this->type_structs_[i].props, this->type_structs_[i].super_types ACE_ENV_ARG_PARAMETER); @@ -259,8 +253,7 @@ TAO_Service_Type_Exporter::describe_all_types (ACE_ENV_SINGLE_ARG_DECL) for (int i = 0; i < NUM_TYPES; i++) { CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct = - this->repos_->describe_type (ACE_const_cast (const CosTrading::ServiceTypeName, - TT_Info::INTERFACE_NAMES[i]) + this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -294,8 +287,7 @@ TAO_Service_Type_Exporter::fully_describe_all_types (ACE_ENV_SINGLE_ARG_DECL) for (int i = 0; i < NUM_TYPES; i++) { CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct = - this->repos_->fully_describe_type (ACE_const_cast (const CosTrading::ServiceTypeName, - TT_Info::INTERFACE_NAMES[i]) + this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp index fef5f10f4b8..c28feb6e4f3 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp @@ -14,7 +14,7 @@ TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp) } template <class T> CORBA::Any* -TAO_Simple_Dynamic_Property<T>::evalDP (const CosTrading::PropertyName, +TAO_Simple_Dynamic_Property<T>::evalDP (const char*, CORBA::TypeCode_ptr, const CORBA::Any& ACE_ENV_ARG_DECL_NOT_USED) diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h index 8204458c646..28cf7b442dd 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h @@ -32,7 +32,7 @@ public: TAO_Simple_Dynamic_Property (const T& dp); - virtual CORBA::Any* evalDP (const CosTrading::PropertyName /* name */, + virtual CORBA::Any* evalDP (const char* /* name */, CORBA::TypeCode_ptr /* returned_type */, const CORBA::Any& /* extra_info */ ACE_ENV_ARG_DECL_NOT_USED) diff --git a/TAO/tests/Abstract_Interface/Abstract_Interface.dsw b/TAO/tests/Abstract_Interface/Abstract_Interface.dsw index 1736ff45c69..69d301dcb7e 100644 --- a/TAO/tests/Abstract_Interface/Abstract_Interface.dsw +++ b/TAO/tests/Abstract_Interface/Abstract_Interface.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "Abstract Interface Client"=".\Abstract_Interface_Client.dsp" - Package Owner=<4>
+Project: "Abstract Interface Client"=".\Abstract Interface Client\Abstract Interface Client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@ Package=<4> ###############################################################################
-Project: "Abstract Interface Server"=".\Abstract_Interface_Server.dsp" - Package Owner=<4>
+Project: "Abstract Interface Server"=".\Abstract Interface Server\Abstract Interface Server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -38,3 +38,4 @@ Package=<3> }}}
###############################################################################
+
diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile index da8e947890c..9e833243520 100644 --- a/TAO/tests/Makefile +++ b/TAO/tests/Makefile @@ -45,7 +45,6 @@ DIRS = CDR \ Faults \ Param_Test \ DSI_Gateway \ - Abstract_Interface \ AMI \ AMI_Timeouts \ Timeout \ diff --git a/TAO/tests/Makefile.bor b/TAO/tests/Makefile.bor index 59f3c52872b..817afcfaf9e 100644 --- a/TAO/tests/Makefile.bor +++ b/TAO/tests/Makefile.bor @@ -3,7 +3,6 @@ # DIRS = \ - Abstract_Interface \ AMH_Exceptions \ AMI \ AMI_Buffering \ diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index 55ce89f483e..09e993346be 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -125,15 +125,15 @@ Param_Test_i::test_unbounded_string (const char *s1, // the in string. For the inout, we append the same string to itself and send // it back char * -Param_Test_i::test_bounded_string (const Param_Test::short_string s1, - Param_Test::short_string &s2, - Param_Test::short_string_out s3 +Param_Test_i::test_bounded_string (const char *s1, + char *&s2, + CORBA::String_out s3 ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - Param_Test::short_string retstr = CORBA::string_dup (s1); + char *retstr = CORBA::string_dup (s1); s3 = CORBA::string_dup (s1); - Param_Test::short_string tmp = CORBA::string_alloc (2*ACE_OS::strlen (s2)); + char *tmp = CORBA::string_alloc (2*ACE_OS::strlen (s2)); ACE_OS::sprintf (tmp, "%s%s", s2, s2); CORBA::string_free (s2); s2 = tmp; @@ -167,9 +167,9 @@ Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1, // the in string. For the inout, we append the same string to itself and send // it back CORBA::WChar * -Param_Test_i::test_bounded_wstring (const Param_Test::short_wstring ws1, - Param_Test::short_wstring &ws2, - Param_Test::short_wstring_out ws3 +Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1, + CORBA::WChar *&ws2, + CORBA::WString_out ws3 ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h index 0a86f115ceb..219f2b2c1ea 100644 --- a/TAO/tests/Param_Test/param_test_i.h +++ b/TAO/tests/Param_Test/param_test_i.h @@ -81,9 +81,9 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // test for unbounded strings - virtual char *test_bounded_string (const Param_Test::short_string s1, - Param_Test::short_string &s2, - Param_Test::short_string_out s3 + virtual char *test_bounded_string (const char *s1, + char *&s2, + CORBA::String_out s3 ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for bounded strings @@ -95,9 +95,9 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // test for unbounded wstrings - virtual CORBA::WChar *test_bounded_wstring (const Param_Test::short_wstring ws1, - Param_Test::short_wstring &ws2, - Param_Test::short_wstring_out ws3 + virtual CORBA::WChar *test_bounded_wstring (const CORBA::WChar *ws1, + CORBA::WChar *&ws2, + CORBA::WString_out ws3 ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for bounded wstrings diff --git a/TAO/tests/TAO_Tests.dsw b/TAO/tests/TAO_Tests.dsw index 551a76ebdde..7609035cd8b 100644 --- a/TAO/tests/TAO_Tests.dsw +++ b/TAO/tests/TAO_Tests.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "AMI Timeout Client"=.\AMI_Timeouts\client.dsp - Package Owner=<4>
+Project: "AMI Timeout Client"=".\AMI_Timeouts\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@ Package=<4> ###############################################################################
-Project: "AMI Timeout Server"=.\AMI_Timeouts\server.dsp - Package Owner=<4>
+Project: "AMI Timeout Server"=".\AMI_Timeouts\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -27,7 +27,7 @@ Package=<4> ###############################################################################
-Project: "AMI_Buffering Admin"=.\AMI_Buffering\admin.dsp - Package Owner=<4>
+Project: "AMI_Buffering Admin"=".\AMI_Buffering\admin.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -39,7 +39,7 @@ Package=<4> ###############################################################################
-Project: "AMI_Buffering Client"=.\AMI_Buffering\client.dsp - Package Owner=<4>
+Project: "AMI_Buffering Client"=".\AMI_Buffering\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -51,7 +51,7 @@ Package=<4> ###############################################################################
-Project: "AMI_Buffering Server"=.\AMI_Buffering\server.dsp - Package Owner=<4>
+Project: "AMI_Buffering Server"=".\AMI_Buffering\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -63,7 +63,7 @@ Package=<4> ###############################################################################
-Project: "AMI_Test_Client"=.\AMI\AMI_Test_Client.dsp - Package Owner=<4>
+Project: "AMI_Test_Client"=".\AMI\AMI_Test_Client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -75,7 +75,7 @@ Package=<4> ###############################################################################
-Project: "AMI_Test_Server"=.\AMI\AMI_Test_Server.dsp - Package Owner=<4>
+Project: "AMI_Test_Server"=".\AMI\AMI_Test_Server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -87,7 +87,7 @@ Package=<4> ###############################################################################
-Project: "AMI_Test_Simple_Client"=.\AMI\AMI_Test_Simple_Client.dsp - Package Owner=<4>
+Project: "AMI_Test_Simple_Client"=".\AMI\AMI_Test_Simple_Client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -99,7 +99,7 @@ Package=<4> ###############################################################################
-Project: "Abstract Interface Client"=".\Abstract_Interface\Abstract Interface Client.dsp" - Package Owner=<4>
+Project: "BiDir Client"=".\BiDirectional\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -111,7 +111,7 @@ Package=<4> ###############################################################################
-Project: "Abstract Interface Server"=".\Abstract_Interface\Abstract Interface Server.dsp" - Package Owner=<4>
+Project: "BiDir Server"=".\BiDirectional\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -123,7 +123,7 @@ Package=<4> ###############################################################################
-Project: "BiDir Client"=.\BiDirectional\client.dsp - Package Owner=<4>
+Project: "BiDirectional_NestedUpcall Client"=".\BiDirectional_NestedUpcall\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -135,7 +135,7 @@ Package=<4> ###############################################################################
-Project: "BiDir Server"=.\BiDirectional\server.dsp - Package Owner=<4>
+Project: "BiDirectional_NestedUpcall Server"=".\BiDirectional_NestedUpcall\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -147,7 +147,7 @@ Package=<4> ###############################################################################
-Project: "BiDirectional_NestedUpcall Client"=.\BiDirectional_NestedUpcall\client.dsp - Package Owner=<4>
+Project: "Big_Oneways Client"=".\Big_Oneways\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -159,7 +159,7 @@ Package=<4> ###############################################################################
-Project: "BiDirectional_NestedUpcall Server"=.\BiDirectional_NestedUpcall\server.dsp - Package Owner=<4>
+Project: "Big_Oneways Server"=".\Big_Oneways\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -171,7 +171,7 @@ Package=<4> ###############################################################################
-Project: "Big_Oneways Client"=.\Big_Oneways\client.dsp - Package Owner=<4>
+Project: "Big_Reply Client"=".\Big_Reply\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -183,7 +183,7 @@ Package=<4> ###############################################################################
-Project: "Big_Oneways Server"=.\Big_Oneways\server.dsp - Package Owner=<4>
+Project: "Big_Reply Server"=".\Big_Reply\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -195,7 +195,7 @@ Package=<4> ###############################################################################
-Project: "Big_Reply Client"=.\Big_Reply\client.dsp - Package Owner=<4>
+Project: "Big_Request_Muxing Client"=".\Big_Request_Muxing\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -207,7 +207,7 @@ Package=<4> ###############################################################################
-Project: "Big_Reply Server"=.\Big_Reply\server.dsp - Package Owner=<4>
+Project: "Big_Request_Muxing Server"=".\Big_Request_Muxing\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -219,7 +219,7 @@ Package=<4> ###############################################################################
-Project: "Big_Request_Muxing Client"=.\Big_Request_Muxing\client.dsp - Package Owner=<4>
+Project: "Big_Twoways Client"=".\Big_Twoways\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -231,7 +231,7 @@ Package=<4> ###############################################################################
-Project: "Big_Request_Muxing Server"=.\Big_Request_Muxing\server.dsp - Package Owner=<4>
+Project: "Big_Twoways Server"=".\Big_Twoways\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -243,7 +243,7 @@ Package=<4> ###############################################################################
-Project: "Big_Twoways Client"=.\Big_Twoways\client.dsp - Package Owner=<4>
+Project: "Blocking_Sync_None Client"=".\Blocking_Sync_None\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -255,7 +255,7 @@ Package=<4> ###############################################################################
-Project: "Big_Twoways Server"=.\Big_Twoways\server.dsp - Package Owner=<4>
+Project: "Blocking_Sync_None Server"=".\Blocking_Sync_None\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -267,7 +267,7 @@ Package=<4> ###############################################################################
-Project: "Blocking_Sync_None Client"=.\Blocking_Sync_None\client.dsp - Package Owner=<4>
+Project: "CDR Basic Types"=".\CDR\basic_types.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -279,7 +279,7 @@ Package=<4> ###############################################################################
-Project: "Blocking_Sync_None Server"=.\Blocking_Sync_None\server.dsp - Package Owner=<4>
+Project: "CDR Growth"=".\CDR\growth.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -291,7 +291,7 @@ Package=<4> ###############################################################################
-Project: "CDR Basic Types"=.\CDR\basic_types.dsp - Package Owner=<4>
+Project: "CDR TC"=".\CDR\tc.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -303,7 +303,7 @@ Package=<4> ###############################################################################
-Project: "CDR Growth"=.\CDR\growth.dsp - Package Owner=<4>
+Project: "Cache Grow Client"=".\Cache_Growth_Test\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -315,7 +315,7 @@ Package=<4> ###############################################################################
-Project: "CDR TC"=.\CDR\tc.dsp - Package Owner=<4>
+Project: "Cache Grow Server"=".\Cache_Growth_Test\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -327,7 +327,7 @@ Package=<4> ###############################################################################
-Project: "Cache Grow Client"=.\Cache_Growth_Test\client.dsp - Package Owner=<4>
+Project: "Client_Leaks Child"=".\Client_Leaks\child.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -339,7 +339,7 @@ Package=<4> ###############################################################################
-Project: "Cache Grow Server"=.\Cache_Growth_Test\server.dsp - Package Owner=<4>
+Project: "Client_Leaks Client"=".\Client_Leaks\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -351,7 +351,7 @@ Package=<4> ###############################################################################
-Project: "Client_Leaks Child"=.\Client_Leaks\child.dsp - Package Owner=<4>
+Project: "Client_Leaks Server"=".\Client_Leaks\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -363,7 +363,7 @@ Package=<4> ###############################################################################
-Project: "Client_Leaks Client"=.\Client_Leaks\client.dsp - Package Owner=<4>
+Project: "Codec Client"=".\Codec\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -375,31 +375,7 @@ Package=<4> ###############################################################################
-Project: "Client_Leaks Server"=.\Client_Leaks\server.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Codec Client"=.\Codec\client.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Collocation"=.\Collocation\Collocation.dsp - Package Owner=<4>
+Project: "Collocation"=".\Collocation\Collocation.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -414,7 +390,7 @@ Package=<4> ###############################################################################
-Project: "Collocation Diamond DLL"=.\Collocation\Diamond.dsp - Package Owner=<4>
+Project: "Collocation Diamond DLL"=".\Collocation\Diamond.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -429,7 +405,7 @@ Package=<4> ###############################################################################
-Project: "Collocation Test Stubs DLL"=.\Collocation\Collocation_Test_Stubs.dsp - Package Owner=<4>
+Project: "Collocation Test Stubs DLL"=".\Collocation\Collocation_Test_Stubs.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -441,7 +417,7 @@ Package=<4> ###############################################################################
-Project: "Connection Purging Client"=.\Connection_Purging\client.dsp - Package Owner=<4>
+Project: "Connection Purging Client"=".\Connection_Purging\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -453,7 +429,7 @@ Package=<4> ###############################################################################
-Project: "Connection Purging Server"=.\Connection_Purging\server.dsp - Package Owner=<4>
+Project: "Connection Purging Server"=".\Connection_Purging\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -465,7 +441,7 @@ Package=<4> ###############################################################################
-Project: "Crash_On_Write Client"=.\Crash_On_Write\client.dsp - Package Owner=<4>
+Project: "Crash_On_Write Client"=".\Crash_On_Write\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -477,7 +453,7 @@ Package=<4> ###############################################################################
-Project: "Crash_On_Write Server"=.\Crash_On_Write\server.dsp - Package Owner=<4>
+Project: "Crash_On_Write Server"=".\Crash_On_Write\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -489,7 +465,7 @@ Package=<4> ###############################################################################
-Project: "Crashed_Callback Server"=.\Crashed_Callback\server.dsp - Package Owner=<4>
+Project: "Crashed_Callback Server"=".\Crashed_Callback\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -501,7 +477,7 @@ Package=<4> ###############################################################################
-Project: "Crashed_Callbacks Client"=.\Crashed_Callback\client.dsp - Package Owner=<4>
+Project: "Crashed_Callbacks Client"=".\Crashed_Callback\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -513,7 +489,7 @@ Package=<4> ###############################################################################
-Project: "DLL_ORB Test_Client_Module"=.\DLL_ORB\Test_Client_Module.dsp - Package Owner=<4>
+Project: "DLL_ORB Test_Client_Module"=".\DLL_ORB\Test_Client_Module.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -525,7 +501,7 @@ Package=<4> ###############################################################################
-Project: "DLL_ORB Test_Server_Module"=.\DLL_ORB\Test_Server_Module.dsp - Package Owner=<4>
+Project: "DLL_ORB Test_Server_Module"=".\DLL_ORB\Test_Server_Module.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -537,7 +513,7 @@ Package=<4> ###############################################################################
-Project: "DLL_ORB client"=.\DLL_ORB\client.dsp - Package Owner=<4>
+Project: "DLL_ORB client"=".\DLL_ORB\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -552,7 +528,7 @@ Package=<4> ###############################################################################
-Project: "DLL_ORB server"=.\DLL_ORB\server.dsp - Package Owner=<4>
+Project: "DLL_ORB server"=".\DLL_ORB\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -567,7 +543,7 @@ Package=<4> ###############################################################################
-Project: "DSI_Gateway_Client"=.\DSI_Gateway\DSI_Gateway_Client.dsp - Package Owner=<4>
+Project: "DSI_Gateway_Client"=".\DSI_Gateway\DSI_Gateway_Client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -579,7 +555,7 @@ Package=<4> ###############################################################################
-Project: "DSI_Gateway_Server"=.\DSI_Gateway\DSI_Gateway_Server.dsp - Package Owner=<4>
+Project: "DSI_Gateway_Server"=".\DSI_Gateway\DSI_Gateway_Server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -591,7 +567,7 @@ Package=<4> ###############################################################################
-Project: "DSI_Gateway_Service"=.\DSI_Gateway\DSI_Gateway_Service.dsp - Package Owner=<4>
+Project: "DSI_Gateway_Service"=".\DSI_Gateway\DSI_Gateway_Service.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -603,7 +579,7 @@ Package=<4> ###############################################################################
-Project: "DynAny Basics"=.\DynAny_Test\basic_test.dsp - Package Owner=<4>
+Project: "DynAny Basics"=".\DynAny_Test\basic_test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -615,7 +591,7 @@ Package=<4> ###############################################################################
-Project: "Explicit_Event_Loop Client"=.\Explicit_Event_Loop\client.dsp - Package Owner=<4>
+Project: "Explicit_Event_Loop Client"=".\Explicit_Event_Loop\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -627,7 +603,7 @@ Package=<4> ###############################################################################
-Project: "Explicit_Event_Loop Server"=.\Explicit_Event_Loop\server.dsp - Package Owner=<4>
+Project: "Explicit_Event_Loop Server"=".\Explicit_Event_Loop\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -639,7 +615,7 @@ Package=<4> ###############################################################################
-Project: "Exposed_Policies Client"=.\Exposed_Policies\Client.dsp - Package Owner=<4>
+Project: "Exposed_Policies Client"=".\Exposed_Policies\Client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -651,7 +627,7 @@ Package=<4> ###############################################################################
-Project: "Exposed_Policies Server"=.\Exposed_Policies\Server.dsp - Package Owner=<4>
+Project: "Exposed_Policies Server"=".\Exposed_Policies\Server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -663,7 +639,7 @@ Package=<4> ###############################################################################
-Project: "Faults Client"=.\Faults\client.dsp - Package Owner=<4>
+Project: "Faults Client"=".\Faults\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -675,7 +651,7 @@ Package=<4> ###############################################################################
-Project: "Faults Middle Server"=.\Faults\middle.dsp - Package Owner=<4>
+Project: "Faults Middle Server"=".\Faults\middle.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -687,7 +663,7 @@ Package=<4> ###############################################################################
-Project: "Faults Ping"=.\Faults\ping.dsp - Package Owner=<4>
+Project: "Faults Ping"=".\Faults\ping.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -699,7 +675,7 @@ Package=<4> ###############################################################################
-Project: "Faults Pong"=.\Faults\pong.dsp - Package Owner=<4>
+Project: "Faults Pong"=".\Faults\pong.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -711,7 +687,7 @@ Package=<4> ###############################################################################
-Project: "Faults Server"=.\Faults\server.dsp - Package Owner=<4>
+Project: "Faults Server"=".\Faults\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -723,7 +699,7 @@ Package=<4> ###############################################################################
-Project: "Forwarding Client"=.\Forwarding\client.dsp - Package Owner=<4>
+Project: "Forwarding Client"=".\Forwarding\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -735,7 +711,7 @@ Package=<4> ###############################################################################
-Project: "Forwarding Server"=.\Forwarding\server.dsp - Package Owner=<4>
+Project: "Forwarding Server"=".\Forwarding\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -747,7 +723,7 @@ Package=<4> ###############################################################################
-Project: "Hello Client"=.\Hello\client.dsp - Package Owner=<4>
+Project: "Hello Client"=".\Hello\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -759,7 +735,7 @@ Package=<4> ###############################################################################
-Project: "Hello Server"=.\Hello\server.dsp - Package Owner=<4>
+Project: "Hello Server"=".\Hello\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -771,7 +747,7 @@ Package=<4> ###############################################################################
-Project: "IOR CorbaLoc Client"=.\ior_corbaloc\ior_corbaloc_client.dsp - Package Owner=<4>
+Project: "IOR CorbaLoc Client"=".\ior_corbaloc\ior_corbaloc_client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -783,7 +759,7 @@ Package=<4> ###############################################################################
-Project: "IOR CorbaLoc Server"=.\ior_corbaloc\ior_corbaloc_server.dsp - Package Owner=<4>
+Project: "IOR CorbaLoc Server"=".\ior_corbaloc\ior_corbaloc_server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -795,7 +771,7 @@ Package=<4> ###############################################################################
-Project: "IOR CorbaName Client"=.\ior_corbaloc\ior_corbaname_client.dsp - Package Owner=<4>
+Project: "IOR CorbaName Client"=".\ior_corbaloc\ior_corbaname_client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -807,7 +783,7 @@ Package=<4> ###############################################################################
-Project: "IORTest"=.\IORManipulation\IORTest.dsp - Package Owner=<4>
+Project: "IORTest"=".\IORManipulation\IORTest.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -831,7 +807,7 @@ Package=<4> ###############################################################################
-Project: "Leader_Followers Client"=.\Leader_Followers\client.dsp - Package Owner=<4>
+Project: "Leader_Followers Client"=".\Leader_Followers\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -843,7 +819,7 @@ Package=<4> ###############################################################################
-Project: "Leader_Followers Server"=.\Leader_Followers\server.dsp - Package Owner=<4>
+Project: "Leader_Followers Server"=".\Leader_Followers\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -855,7 +831,7 @@ Package=<4> ###############################################################################
-Project: "LongUpcalls AMI_Client"=.\LongUpcalls\ami_client.dsp - Package Owner=<4>
+Project: "LongUpcalls AMI_Client"=".\LongUpcalls\ami_client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -867,7 +843,7 @@ Package=<4> ###############################################################################
-Project: "LongUpcalls AMI_Server"=.\LongUpcalls\ami_server.dsp - Package Owner=<4>
+Project: "LongUpcalls AMI_Server"=".\LongUpcalls\ami_server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -879,7 +855,7 @@ Package=<4> ###############################################################################
-Project: "LongUpcalls Blocking_Client"=.\LongUpcalls\blocking_client.dsp - Package Owner=<4>
+Project: "LongUpcalls Blocking_Client"=".\LongUpcalls\blocking_client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -891,7 +867,7 @@ Package=<4> ###############################################################################
-Project: "LongUpcalls Blocking_Server"=.\LongUpcalls\blocking_server.dsp - Package Owner=<4>
+Project: "LongUpcalls Blocking_Server"=".\LongUpcalls\blocking_server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -903,7 +879,7 @@ Package=<4> ###############################################################################
-Project: "MProfile Client"=.\MProfile\client.dsp - Package Owner=<4>
+Project: "MProfile Client"=".\MProfile\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -915,7 +891,7 @@ Package=<4> ###############################################################################
-Project: "MProfile Server"=.\MProfile\server.dsp - Package Owner=<4>
+Project: "MProfile Server"=".\MProfile\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -927,7 +903,7 @@ Package=<4> ###############################################################################
-Project: "MT Timeout Client"=.\MT_Timeout\MT_Timeout_Client.dsp - Package Owner=<4>
+Project: "MT Timeout Client"=".\MT_Timeout\MT_Timeout_Client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -939,7 +915,7 @@ Package=<4> ###############################################################################
-Project: "MT Timeout Server"=.\MT_Timeout\MT_Timeout_Server.dsp - Package Owner=<4>
+Project: "MT Timeout Server"=".\MT_Timeout\MT_Timeout_Server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -951,7 +927,7 @@ Package=<4> ###############################################################################
-Project: "MT_Client Client"=.\MT_Client\client.dsp - Package Owner=<4>
+Project: "MT_Client Client"=".\MT_Client\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -963,7 +939,7 @@ Package=<4> ###############################################################################
-Project: "MT_Client ORB Creation"=.\MT_Client\orb_creation.dsp - Package Owner=<4>
+Project: "MT_Client ORB Creation"=".\MT_Client\orb_creation.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -975,7 +951,7 @@ Package=<4> ###############################################################################
-Project: "MT_Client Server"=.\MT_Client\server.dsp - Package Owner=<4>
+Project: "MT_Client Server"=".\MT_Client\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -987,7 +963,7 @@ Package=<4> ###############################################################################
-Project: "MT_Server Client"=.\MT_Server\client.dsp - Package Owner=<4>
+Project: "MT_Server Client"=".\MT_Server\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -999,7 +975,7 @@ Package=<4> ###############################################################################
-Project: "MT_Server Server"=.\MT_Server\server.dsp - Package Owner=<4>
+Project: "MT_Server Server"=".\MT_Server\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1011,7 +987,7 @@ Package=<4> ###############################################################################
-Project: "Multiple Client"=.\Multiple\Client.dsp - Package Owner=<4>
+Project: "Multiple Client"=".\Multiple\Client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1023,7 +999,7 @@ Package=<4> ###############################################################################
-Project: "Multiple Inheritance Client"=.\Multiple_Inheritance\client.dsp - Package Owner=<4>
+Project: "Multiple Inheritance Client"=".\Multiple_Inheritance\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1035,7 +1011,7 @@ Package=<4> ###############################################################################
-Project: "Multiple Inheritance Server"=.\Multiple_Inheritance\server.dsp - Package Owner=<4>
+Project: "Multiple Inheritance Server"=".\Multiple_Inheritance\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1047,7 +1023,7 @@ Package=<4> ###############################################################################
-Project: "Multiple Server"=.\Multiple\Server.dsp - Package Owner=<4>
+Project: "Multiple Server"=".\Multiple\Server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1059,7 +1035,7 @@ Package=<4> ###############################################################################
-Project: "Muxing Client"=.\Muxing\client.dsp - Package Owner=<4>
+Project: "Muxing Client"=".\Muxing\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1071,7 +1047,7 @@ Package=<4> ###############################################################################
-Project: "Muxing Server"=.\Muxing\server.dsp - Package Owner=<4>
+Project: "Muxing Server"=".\Muxing\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1083,7 +1059,7 @@ Package=<4> ###############################################################################
-Project: "Native Exceptions Client"=.\Native_Exceptions\client.dsp - Package Owner=<4>
+Project: "Native Exceptions Client"=".\Native_Exceptions\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1095,7 +1071,7 @@ Package=<4> ###############################################################################
-Project: "Native Exceptions Server"=.\Native_Exceptions\server.dsp - Package Owner=<4>
+Project: "Native Exceptions Server"=".\Native_Exceptions\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1107,7 +1083,7 @@ Package=<4> ###############################################################################
-Project: "Nested Upcall MT_Client Client"=.\NestedUpcall\MT_Client_Test\client.dsp - Package Owner=<4>
+Project: "Nested Upcall MT_Client Client"=".\NestedUpcall\MT_Client_Test\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1119,7 +1095,7 @@ Package=<4> ###############################################################################
-Project: "Nested Upcall MT_Client Server"=.\NestedUpcall\MT_Client_Test\server.dsp - Package Owner=<4>
+Project: "Nested Upcall MT_Client Server"=".\NestedUpcall\MT_Client_Test\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1131,7 +1107,7 @@ Package=<4> ###############################################################################
-Project: "Nested Upcall Simple Client"=.\NestedUpcall\Simple\client.dsp - Package Owner=<4>
+Project: "Nested Upcall Simple Client"=".\NestedUpcall\Simple\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1143,7 +1119,7 @@ Package=<4> ###############################################################################
-Project: "Nested Upcall Simple Server"=.\NestedUpcall\Simple\server.dsp - Package Owner=<4>
+Project: "Nested Upcall Simple Server"=".\NestedUpcall\Simple\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1155,7 +1131,7 @@ Package=<4> ###############################################################################
-Project: "Nested Upcall Triangle Initiator"=.\NestedUpcall\Triangle_Test\initiator.dsp - Package Owner=<4>
+Project: "Nested Upcall Triangle Initiator"=".\NestedUpcall\Triangle_Test\initiator.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1167,7 +1143,7 @@ Package=<4> ###############################################################################
-Project: "Nested Upcall Triangle Server_A"=.\NestedUpcall\Triangle_Test\server_A.dsp - Package Owner=<4>
+Project: "Nested Upcall Triangle Server_A"=".\NestedUpcall\Triangle_Test\server_A.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1179,7 +1155,7 @@ Package=<4> ###############################################################################
-Project: "Nested Upcall Triangle Server_B"=.\NestedUpcall\Triangle_Test\server_B.dsp - Package Owner=<4>
+Project: "Nested Upcall Triangle Server_B"=".\NestedUpcall\Triangle_Test\server_B.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1191,7 +1167,7 @@ Package=<4> ###############################################################################
-Project: "Nested_Event_Loop Client"=.\Nested_Event_Loop\client.dsp - Package Owner=<4>
+Project: "Nested_Event_Loop Client"=".\Nested_Event_Loop\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1203,7 +1179,7 @@ Package=<4> ###############################################################################
-Project: "Nested_Event_Loop Server"=.\Nested_Event_Loop\server.dsp - Package Owner=<4>
+Project: "Nested_Event_Loop Server"=".\Nested_Event_Loop\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1215,7 +1191,7 @@ Package=<4> ###############################################################################
-Project: "ORB_destroy"=.\ORB_destroy\ORB_destroy.dsp - Package Owner=<4>
+Project: "ORB_destroy"=".\ORB_destroy\ORB_destroy.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1227,7 +1203,7 @@ Package=<4> ###############################################################################
-Project: "ORB_init"=.\ORB_init\ORB_init.dsp - Package Owner=<4>
+Project: "ORB_init"=".\ORB_init\ORB_init.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1239,7 +1215,7 @@ Package=<4> ###############################################################################
-Project: "ORT Server"=.\ORT\server.dsp - Package Owner=<4>
+Project: "ORT Server"=".\ORT\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1251,7 +1227,7 @@ Package=<4> ###############################################################################
-Project: "ORT client"=.\ORT\client.dsp - Package Owner=<4>
+Project: "ORT client"=".\ORT\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1263,7 +1239,7 @@ Package=<4> ###############################################################################
-Project: "Object_Loader Driver"=.\Object_Loader\driver.dsp - Package Owner=<4>
+Project: "Object_Loader Driver"=".\Object_Loader\driver.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1275,7 +1251,7 @@ Package=<4> ###############################################################################
-Project: "OctetSeq"=.\OctetSeq\OctetSeq.dsp - Package Owner=<4>
+Project: "OctetSeq"=".\OctetSeq\OctetSeq.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1287,7 +1263,7 @@ Package=<4> ###############################################################################
-Project: "OctetSeq Client"=.\OctetSeq\client.dsp - Package Owner=<4>
+Project: "OctetSeq Client"=".\OctetSeq\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1299,7 +1275,7 @@ Package=<4> ###############################################################################
-Project: "OctetSeq Server"=.\OctetSeq\server.dsp - Package Owner=<4>
+Project: "OctetSeq Server"=".\OctetSeq\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1311,7 +1287,7 @@ Package=<4> ###############################################################################
-Project: "Oneways_Invoking_Twoways Client"=.\Oneways_Invoking_Twoways\client.dsp - Package Owner=<4>
+Project: "Oneways_Invoking_Twoways Client"=".\Oneways_Invoking_Twoways\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1323,7 +1299,7 @@ Package=<4> ###############################################################################
-Project: "Oneways_Invoking_Twoways Server"=.\Oneways_Invoking_Twoways\server.dsp - Package Owner=<4>
+Project: "Oneways_Invoking_Twoways Server"=".\Oneways_Invoking_Twoways\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1335,7 +1311,7 @@ Package=<4> ###############################################################################
-Project: "POA Default_Servant"=.\POA\Default_Servant\Default_Servant.dsp - Package Owner=<4>
+Project: "POA Etherealization"=".\POA\Etherealization\Etherealization.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1347,7 +1323,7 @@ Package=<4> ###############################################################################
-Project: "POA Etherealization"=.\POA\Etherealization\Etherealization.dsp - Package Owner=<4>
+Project: "POA Policies"=".\POA\Policies\Policies.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1359,7 +1335,7 @@ Package=<4> ###############################################################################
-Project: "POA Excessive_Object_Deactivations"=.\POA\Excessive_Object_Deactivations\Excessive_Object_Deactivations.dsp - Package Owner=<4>
+Project: "POA Excessive_Object_Deactivations"=".\POA\Excessive_Object_Deactivations\Excessive_Object_Deactivations.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1371,7 +1347,7 @@ Package=<4> ###############################################################################
-Project: "POA Identity"=.\POA\Identity\Identity.dsp - Package Owner=<4>
+Project: "POA Identity"=".\POA\Identity\Identity.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1383,7 +1359,7 @@ Package=<4> ###############################################################################
-Project: "POA Non_Servant_Upcalls"=.\POA\Non_Servant_Upcalls\Non_Servant_Upcalls.dsp - Package Owner=<4>
+Project: "POA Non_Servant_Upcalls"=".\POA\Non_Servant_Upcalls\Non_Servant_Upcalls.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1395,7 +1371,7 @@ Package=<4> ###############################################################################
-Project: "POA Object_Reactivation"=.\POA\Object_Reactivation\Object_Reactivation.dsp - Package Owner=<4>
+Project: "POA Object_Reactivation"=".\POA\Object_Reactivation\Object_Reactivation.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1407,7 +1383,7 @@ Package=<4> ###############################################################################
-Project: "POA POA_Destruction"=.\POA\POA_Destruction\POA_Destruction.dsp - Package Owner=<4>
+Project: "POA POA_Destruction"=".\POA\POA_Destruction\POA_Destruction.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1419,7 +1395,7 @@ Package=<4> ###############################################################################
-Project: "POA Persistent ID Client"=.\POA\Persistent_ID\client.dsp - Package Owner=<4>
+Project: "POA Default_Servant"=".\POA\Default_Servant\Default_Servant.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1431,7 +1407,7 @@ Package=<4> ###############################################################################
-Project: "POA Persistent ID Server"=.\POA\Persistent_ID\server.dsp - Package Owner=<4>
+Project: "POA Persistent_ID Client"=".\POA\Persistent_ID\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1443,7 +1419,7 @@ Package=<4> ###############################################################################
-Project: "POA Policies"=.\POA\Policies\Policies.dsp - Package Owner=<4>
+Project: "POA Persistent_ID Server"=".\POA\Persistent_ID\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1455,7 +1431,7 @@ Package=<4> ###############################################################################
-Project: "POA Single_Threaded_POA"=.\POA\Single_Threaded_POA\Single_Threaded_POA.dsp - Package Owner=<4>
+Project: "POA Single_Threaded_POA"=".\POA\Single_Threaded_POA\Single_Threaded_POA.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1467,7 +1443,7 @@ Package=<4> ###############################################################################
-Project: "POA wait_for_completion"=.\POA\wait_for_completion\wait_for_completion.dsp - Package Owner=<4>
+Project: "POA wait_for_completion"=".\POA\wait_for_completion\wait_for_completion.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1479,7 +1455,7 @@ Package=<4> ###############################################################################
-Project: "Param_Test Client"=.\Param_Test\client.dsp - Package Owner=<4>
+Project: "Param_Test Client"=".\Param_Test\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1491,7 +1467,7 @@ Package=<4> ###############################################################################
-Project: "Param_Test Server"=.\Param_Test\server.dsp - Package Owner=<4>
+Project: "Param_Test Server"=".\Param_Test\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1503,7 +1479,7 @@ Package=<4> ###############################################################################
-Project: "Queued_Message_Test"=.\Queued_Message_Test\Queued_Message_Test.dsp - Package Owner=<4>
+Project: "Queued_Message_Test"=".\Queued_Message_Test\Queued_Message_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1515,7 +1491,7 @@ Package=<4> ###############################################################################
-Project: "Reliable_Oneways Client"=.\Reliable_Oneways\client.dsp - Package Owner=<4>
+Project: "Reliable_Oneways Client"=".\Reliable_Oneways\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1527,7 +1503,7 @@ Package=<4> ###############################################################################
-Project: "Reliable_Oneways Server"=.\Reliable_Oneways\server.dsp - Package Owner=<4>
+Project: "Reliable_Oneways Server"=".\Reliable_Oneways\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1539,7 +1515,7 @@ Package=<4> ###############################################################################
-Project: "Server_Leaks Client"=.\Server_Leaks\client.dsp - Package Owner=<4>
+Project: "Server_Leaks Client"=".\Server_Leaks\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1551,7 +1527,7 @@ Package=<4> ###############################################################################
-Project: "Server_Leaks Server"=.\Server_Leaks\server.dsp - Package Owner=<4>
+Project: "Server_Leaks Server"=".\Server_Leaks\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1563,7 +1539,7 @@ Package=<4> ###############################################################################
-Project: "Single_Read Client"=.\Single_Read\client.dsp - Package Owner=<4>
+Project: "Single_Read Client"=".\Single_Read\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1575,7 +1551,7 @@ Package=<4> ###############################################################################
-Project: "Single_Read Server"=.\Single_Read\server.dsp - Package Owner=<4>
+Project: "Single_Read Server"=".\Single_Read\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1587,7 +1563,7 @@ Package=<4> ###############################################################################
-Project: "Test_DLL"=.\Object_Loader\Test_DLL.dsp - Package Owner=<4>
+Project: "Test_DLL"=".\Object_Loader\Test_DLL.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1599,7 +1575,7 @@ Package=<4> ###############################################################################
-Project: "Timed_Buffered_Oneways Client"=.\Timed_Buffered_Oneways\client.dsp - Package Owner=<4>
+Project: "Timed_Buffered_Oneways Client"=".\Timed_Buffered_Oneways\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1611,7 +1587,7 @@ Package=<4> ###############################################################################
-Project: "Timed_Buffered_Oneways Server"=.\Timed_Buffered_Oneways\server.dsp - Package Owner=<4>
+Project: "Timed_Buffered_Oneways Server"=".\Timed_Buffered_Oneways\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1623,7 +1599,7 @@ Package=<4> ###############################################################################
-Project: "Timeout Client"=.\Timeout\client.dsp - Package Owner=<4>
+Project: "Timeout Client"=".\Timeout\client.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1635,7 +1611,7 @@ Package=<4> ###############################################################################
-Project: "Timeout Server"=.\Timeout\server.dsp - Package Owner=<4>
+Project: "Timeout Server"=".\Timeout\server.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1647,7 +1623,7 @@ Package=<4> ###############################################################################
-Project: "idl_test"=.\IDL_Test\idl_test.dsp - Package Owner=<4>
+Project: "idl_test"=".\IDL_Test\idl_test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1659,7 +1635,7 @@ Package=<4> ###############################################################################
-Project: "portspan"=.\ORB_init\Portspan\portspan.dsp - Package Owner=<4>
+Project: "portspan"=".\ORB_init\Portspan\portspan.dsp" - Package Owner=<4>
Package=<5>
{{{
|