diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-07 14:28:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 14:28:42 +0100 |
| commit | 884dcea8b196f72cb995de9f46d61a6ee6521222 (patch) | |
| tree | 433c1bc15ac511da91a2206e7e1a55acd4cba8dc /TAO/TAO_IDL/be | |
| parent | 9b54b6935ed2449438e3e39690ec2bba2ba12945 (diff) | |
| parent | e1d1203db3e48aa29bb3774f3ba444da26091fb1 (diff) | |
| download | ATCD-884dcea8b196f72cb995de9f46d61a6ee6521222.tar.gz | |
Merge pull request #1327 from jwillemsen/jwi-taoidlnullptr2
Use nullptr instead of 0 in tao_idl
Diffstat (limited to 'TAO/TAO_IDL/be')
199 files changed, 1836 insertions, 1836 deletions
diff --git a/TAO/TAO_IDL/be/be_argument.cpp b/TAO/TAO_IDL/be/be_argument.cpp index 5a22098460c..95d72a2c683 100644 --- a/TAO/TAO_IDL/be/be_argument.cpp +++ b/TAO/TAO_IDL/be/be_argument.cpp @@ -42,7 +42,7 @@ be_argument::be_argument (AST_Argument::Direction d, // declared in an included file UNLESS the enclosing // interface is abstract, in which case we regenerate the // operation. - if (dcl != 0 + if (dcl != nullptr && !dcl->is_local () && (idl_global->in_main_file () || dcl->is_abstract ())) { diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp index b7013e03ae0..05b13feba41 100644 --- a/TAO/TAO_IDL/be/be_array.cpp +++ b/TAO/TAO_IDL/be/be_array.cpp @@ -61,8 +61,8 @@ be_array::create_name (void) { char namebuf [NAMEBUFSIZE]; unsigned long i; - UTL_ScopedName *n = 0; - be_decl *scope = 0; + UTL_ScopedName *n = nullptr; + be_decl *scope = nullptr; ACE_OS::memset (namebuf, '\0', @@ -90,7 +90,7 @@ be_array::create_name (void) AST_Expression *expr = this->dims ()[i]; // Dimension value. - if ((expr == 0) || ((expr != 0) && (expr->ev () == 0))) + if ((expr == nullptr) || ((expr != nullptr) && (expr->ev () == nullptr))) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_array::" @@ -123,15 +123,15 @@ be_array::create_name (void) // Make a copy of the enclosing scope's name. n = (UTL_ScopedName *)scope->name ()->copy (); - Identifier *id = 0; + Identifier *id = nullptr; ACE_NEW_RETURN (id, Identifier (ACE_OS::strdup (namebuf)), -1); - UTL_ScopedName *sn = 0; + UTL_ScopedName *sn = nullptr; ACE_NEW_RETURN (sn, UTL_ScopedName (id, - 0), + nullptr), -1); // Add our local name as the last component. @@ -157,37 +157,37 @@ be_array::compute_tc_name (void) // TypeCode. Generate a TypeCode name that is meant for internal // use alone. - Identifier * tao_id = 0; + Identifier * tao_id = nullptr; ACE_NEW (tao_id, Identifier ("TAO")); ACE_NEW (this->tc_name_, UTL_ScopedName (tao_id, - 0)); + nullptr)); ACE_CString local_tc_name = ACE_CString ("tc_") + ACE_CString (this->flat_name ()); - Identifier * typecode_scope = 0; + Identifier * typecode_scope = nullptr; ACE_NEW (typecode_scope, Identifier ("TypeCode")); - UTL_ScopedName * tc_scope_conc_name = 0; + UTL_ScopedName * tc_scope_conc_name = nullptr; ACE_NEW (tc_scope_conc_name, UTL_ScopedName (typecode_scope, - 0)); + nullptr)); this->tc_name_->nconc (tc_scope_conc_name); - Identifier * id = 0; + Identifier * id = nullptr; ACE_NEW (id, Identifier (local_tc_name.c_str ())); - UTL_ScopedName * conc_name = 0; + UTL_ScopedName * conc_name = nullptr; ACE_NEW (conc_name, UTL_ScopedName (id, - 0)); + nullptr)); this->tc_name_->nconc (conc_name); } @@ -208,7 +208,7 @@ be_array::gen_dimensions (TAO_OutStream *os, AST_Expression *expr = this->dims ()[i]; // Dimension value. - if ((expr == 0) || ((expr != 0) && (expr->ev () == 0))) + if ((expr == nullptr) || ((expr != nullptr) && (expr->ev () == nullptr))) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_array::" diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index afd56feaac4..5aad12917c3 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -28,32 +28,32 @@ #include "ace/OS_NS_unistd.h" #include "ace/Numeric_Limits.h" -TAO_CodeGen * tao_cg = 0; +TAO_CodeGen * tao_cg = nullptr; TAO_CodeGen::TAO_CodeGen (void) - : client_header_ (0), - client_stubs_ (0), - client_inline_ (0), - server_header_ (0), - implementation_header_(0), - implementation_skeleton_(0), - server_template_header_ (0), - server_skeletons_ (0), - server_template_skeletons_ (0), - anyop_header_ (0), - anyop_source_ (0), - gperf_input_stream_ (0), - ciao_svnt_header_ (0), - ciao_svnt_source_ (0), - ciao_svnt_template_header_ (0), - ciao_svnt_template_source_ (0), - ciao_exec_header_ (0), - ciao_exec_source_ (0), - ciao_exec_idl_ (0), - ciao_conn_header_ (0), - ciao_conn_source_ (0), - ciao_ami_conn_idl_ (0), - gperf_input_filename_ (0), + : client_header_ (nullptr), + client_stubs_ (nullptr), + client_inline_ (nullptr), + server_header_ (nullptr), + implementation_header_(nullptr), + implementation_skeleton_(nullptr), + server_template_header_ (nullptr), + server_skeletons_ (nullptr), + server_template_skeletons_ (nullptr), + anyop_header_ (nullptr), + anyop_source_ (nullptr), + gperf_input_stream_ (nullptr), + ciao_svnt_header_ (nullptr), + ciao_svnt_source_ (nullptr), + ciao_svnt_template_header_ (nullptr), + ciao_svnt_template_source_ (nullptr), + ciao_exec_header_ (nullptr), + ciao_exec_source_ (nullptr), + ciao_exec_idl_ (nullptr), + ciao_conn_header_ (nullptr), + ciao_conn_source_ (nullptr), + ciao_ami_conn_idl_ (nullptr), + gperf_input_filename_ (nullptr), strategy_ (TAO_PERFECT_HASH) { } @@ -123,7 +123,7 @@ TAO_CodeGen::downcase (const char *str) int TAO_CodeGen::start_client_header (const char *fname) { - if (0 == fname) + if (nullptr == fname) { // Bad file name. return -1; @@ -173,14 +173,14 @@ TAO_CodeGen::start_client_header (const char *fname) "_H_"); } - if (be_global->pre_include () != 0) + if (be_global->pre_include () != nullptr) { *this->client_header_ << "#include /**/ \"" << be_global->pre_include () << "\"\n\n"; } - if (be_global->include_guard () != 0) + if (be_global->include_guard () != nullptr) { *this->client_header_ << "#ifndef " << be_global->include_guard () @@ -189,7 +189,7 @@ TAO_CodeGen::start_client_header (const char *fname) *this->client_header_ << "#error " << "You should not include " << fname; - if (be_global->safe_include () != 0) + if (be_global->safe_include () != nullptr) { *this->client_header_ << ", use " << be_global->safe_include (); } @@ -226,14 +226,14 @@ TAO_CodeGen::start_client_header (const char *fname) // Other include files. - if (be_global->stub_export_include () != 0) + if (be_global->stub_export_include () != nullptr) { *this->client_header_ << "\n#include /**/ \"" << be_global->stub_export_include () << "\""; } - if (be_global->unique_include () != 0) + if (be_global->unique_include () != nullptr) { *this->client_header_ << "\n#include \"" << be_global->unique_include () @@ -276,7 +276,7 @@ TAO_CodeGen::start_client_header (const char *fname) idl_name_str.destroy (); // Sanity check and then print. - if (client_hdr != 0) + if (client_hdr != nullptr) { this->client_header_->print ("\n#include \"%s\"", client_hdr); @@ -296,7 +296,7 @@ TAO_CodeGen::start_client_header (const char *fname) !i.done (); i.advance ()) { - char **tmp = 0; + char **tmp = nullptr; i.next (tmp); // Make a String out of it. @@ -310,7 +310,7 @@ TAO_CodeGen::start_client_header (const char *fname) idl_name_str.destroy (); // Sanity check and then print. - if (client_hdr != 0) + if (client_hdr != nullptr) { this->client_header_->print ("\n#include \"%s\"", client_hdr); @@ -460,7 +460,7 @@ TAO_CodeGen::start_server_header (const char *fname) "_TAO_IDL_", "_H_"); - if (be_global->pre_include () != 0) + if (be_global->pre_include () != nullptr) { *this->server_header_ << "#include /**/ \"" << be_global->pre_include () @@ -523,7 +523,7 @@ TAO_CodeGen::start_server_header (const char *fname) this->gen_skel_hdr_includes (); - if (be_global->skel_export_include () != 0) + if (be_global->skel_export_include () != nullptr) { *this->server_header_ << "\n\n#include /**/ \"" << be_global->skel_export_include () @@ -591,7 +591,7 @@ TAO_CodeGen::start_server_template_header (const char *fname) "_TAO_IDL_", "_H_"); - if (be_global->pre_include () != 0) + if (be_global->pre_include () != nullptr) { *this->server_template_header_ << "#include /**/ \"" << be_global->pre_include () @@ -786,7 +786,7 @@ TAO_CodeGen::start_anyop_header (const char *fname) "_TAO_IDL_", "_H_"); - if (be_global->pre_include () != 0) + if (be_global->pre_include () != nullptr) { *this->anyop_header_ << "#include /**/ \"" << be_global->pre_include () @@ -794,13 +794,13 @@ TAO_CodeGen::start_anyop_header (const char *fname) } // If anyop macro hasn't been set, default to stub macro. - if (be_global->anyop_export_include () != 0) + if (be_global->anyop_export_include () != nullptr) { *this->anyop_header_ << "\n#include /**/ \"" << be_global->anyop_export_include () << "\""; } - else if (be_global->stub_export_include () != 0) + else if (be_global->stub_export_include () != nullptr) { *this->anyop_header_ << "\n#include /**/ \"" << be_global->stub_export_include () @@ -822,7 +822,7 @@ TAO_CodeGen::start_anyop_header (const char *fname) { const char *stub_incl_dir = be_global->stub_include_dir (); - if (stub_incl_dir == 0) + if (stub_incl_dir == nullptr) { tao_prefix = "tao/"; } @@ -1021,7 +1021,7 @@ TAO_CodeGen::start_ciao_svnt_header (const char *fname) "CIAO_SESSION_", "_H_"); - if (be_global->pre_include () != 0) + if (be_global->pre_include () != nullptr) { os << "#include /**/ \"" << be_global->pre_include () @@ -1032,13 +1032,13 @@ TAO_CodeGen::start_ciao_svnt_header (const char *fname) // generated code in the same library, using the skel export macro, // so the values for the servant export default to the skel values. // Eventually, there should be a way to completely decouple them. - if (be_global->svnt_export_include () != 0) + if (be_global->svnt_export_include () != nullptr) { os << "\n#include /**/ \"" << be_global->svnt_export_include () << "\"\n"; } - else if (be_global->skel_export_include () != 0) + else if (be_global->skel_export_include () != nullptr) { os << "\n#include /**/ \"" << be_global->skel_export_include () @@ -1053,7 +1053,7 @@ TAO_CodeGen::start_ciao_svnt_header (const char *fname) << be_nl; - char **path_tmp = 0; + char **path_tmp = nullptr; for (ACE_Unbounded_Queue_Iterator<char *>riter ( idl_global->ciao_lem_file_names ()); @@ -1167,7 +1167,7 @@ TAO_CodeGen::start_ciao_svnt_template_header (const char *fname) "CIAO_SERVANT_", "_H_"); - if (be_global->pre_include () != 0) + if (be_global->pre_include () != nullptr) { os << "#include /**/ \"" << be_global->pre_include () @@ -1178,13 +1178,13 @@ TAO_CodeGen::start_ciao_svnt_template_header (const char *fname) // generated code in the same library, using the skel export macro, // so the values for the servant export default to the skel values. // Eventually, there should be a way to completely decouple them. - if (be_global->svnt_export_include () != 0) + if (be_global->svnt_export_include () != nullptr) { os << "\n#include /**/ \"" << be_global->svnt_export_include () << "\"\n"; } - else if (be_global->skel_export_include () != 0) + else if (be_global->skel_export_include () != nullptr) { os << "\n#include /**/ \"" << be_global->skel_export_include () @@ -1311,7 +1311,7 @@ TAO_CodeGen::start_ciao_exec_header (const char *fname) "CIAO_", "_H_"); - if (be_global->pre_include () != 0) + if (be_global->pre_include () != nullptr) { os << "#include /**/ \"" << be_global->pre_include () @@ -1456,7 +1456,7 @@ TAO_CodeGen::start_ciao_conn_header (const char *fname) "CIAO_", "_H_"); - if (be_global->pre_include () != 0) + if (be_global->pre_include () != nullptr) { os << "#include /**/ \"" << be_global->pre_include () @@ -1464,7 +1464,7 @@ TAO_CodeGen::start_ciao_conn_header (const char *fname) } // This will almost certainly be true, but just in case... - if (be_global->conn_export_include () != 0) + if (be_global->conn_export_include () != nullptr) { this->gen_standard_include ( this->ciao_conn_header_, @@ -1702,7 +1702,7 @@ TAO_CodeGen::end_client_header (void) // Code to put the last #endif. - if (be_global->post_include () != 0) + if (be_global->post_include () != nullptr) { *this->client_header_ << "#include /**/ \"" << be_global->post_include () @@ -1761,7 +1761,7 @@ TAO_CodeGen::end_server_header (void) } } - if (be_global->post_include () != 0) + if (be_global->post_include () != nullptr) { *os << be_nl_2 << "#include /**/ \"" @@ -1779,7 +1779,7 @@ TAO_CodeGen::end_server_header (void) int TAO_CodeGen::end_implementation_header (const char *fname) { - if (fname == 0) + if (fname == nullptr) { // Bad file name. return -1; @@ -1787,7 +1787,7 @@ TAO_CodeGen::end_implementation_header (const char *fname) const char *suffix = ACE_OS::strrchr (fname, '.'); - if (suffix == 0) + if (suffix == nullptr) { // File seems to have no extension, so let us take the name // as it is. @@ -1856,7 +1856,7 @@ TAO_CodeGen::end_server_template_header (void) // Code to put the last #endif. *this->server_template_header_ << "\n\n"; - if (be_global->post_include () != 0) + if (be_global->post_include () != nullptr) { *this->server_template_header_ << "#include /**/ \"" << be_global->post_include () @@ -1904,7 +1904,7 @@ TAO_CodeGen::end_anyop_header (void) *this->anyop_header_ << be_global->versioning_end (); - if (be_global->post_include () != 0) + if (be_global->post_include () != nullptr) { *this->anyop_header_ << "\n\n#include /**/ \"" << be_global->post_include () @@ -1932,7 +1932,7 @@ TAO_CodeGen::end_anyop_source (void) int TAO_CodeGen::end_ciao_svnt_header (void) { - if (be_global->post_include () != 0) + if (be_global->post_include () != nullptr) { *this->ciao_svnt_header_ << "\n\n#include /**/ \"" << be_global->post_include () @@ -1969,7 +1969,7 @@ TAO_CodeGen::end_ciao_svnt_template_header (void) << be_nl << "#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */" << be_nl; - if (be_global->post_include () != 0) + if (be_global->post_include () != nullptr) { *this->ciao_svnt_template_header_ << "\n\n#include /**/ \"" << be_global->post_include () @@ -1994,7 +1994,7 @@ TAO_CodeGen::end_ciao_svnt_template_source (void) int TAO_CodeGen::end_ciao_exec_header (void) { - if (be_global->post_include () != 0) + if (be_global->post_include () != nullptr) { *this->ciao_exec_header_ << "\n\n#include /**/ \"" << be_global->post_include () @@ -2025,7 +2025,7 @@ TAO_CodeGen::end_ciao_exec_idl (void) int TAO_CodeGen::end_ciao_conn_header (void) { - if (be_global->post_include () != 0) + if (be_global->post_include () != nullptr) { *this->ciao_conn_header_ << "\n\n#include /**/ \"" << be_global->post_include () @@ -2089,7 +2089,7 @@ TAO_CodeGen::gen_ident_string (TAO_OutStream *stream) const { const char *str = idl_global->ident_string (); - if (str != 0) + if (str != nullptr) { *stream << "#" << str << be_nl_2; } @@ -2099,29 +2099,29 @@ void TAO_CodeGen::gen_export_files (void) { if (be_global->gen_stub_export_hdr_file () - && be_global->stub_export_macro () != 0 - && (be_global->stub_export_include () != 0 || be_global->stub_export_file () != 0)) + && be_global->stub_export_macro () != nullptr + && (be_global->stub_export_include () != nullptr || be_global->stub_export_file () != nullptr)) { this->gen_export_file ( - (be_global->stub_export_file () != 0) ? be_global->stub_export_file () : be_global->stub_export_include (), + (be_global->stub_export_file () != nullptr) ? be_global->stub_export_file () : be_global->stub_export_include (), be_global->stub_export_macro (), "stub"); } if (be_global->gen_skel_export_hdr_file () - && be_global->skel_export_macro () != 0 - && be_global->skel_export_include () != 0) + && be_global->skel_export_macro () != nullptr + && be_global->skel_export_include () != nullptr) { this->gen_export_file ( - (be_global->skel_export_file () != 0) ? be_global->skel_export_file () : be_global->skel_export_include (), + (be_global->skel_export_file () != nullptr) ? be_global->skel_export_file () : be_global->skel_export_include (), be_global->skel_export_macro (), "skel", true); } if (be_global->gen_svnt_export_hdr_file () - && be_global->svnt_export_macro () != 0 - && be_global->svnt_export_include () != 0) + && be_global->svnt_export_macro () != nullptr + && be_global->svnt_export_include () != nullptr) { this->gen_export_file ( be_global->svnt_export_include (), @@ -2130,8 +2130,8 @@ TAO_CodeGen::gen_export_files (void) } if (be_global->gen_exec_export_hdr_file () - && be_global->exec_export_macro () != 0 - && be_global->exec_export_include () != 0) + && be_global->exec_export_macro () != nullptr + && be_global->exec_export_include () != nullptr) { this->gen_export_file ( be_global->exec_export_include (), @@ -2140,8 +2140,8 @@ TAO_CodeGen::gen_export_files (void) } if (be_global->gen_conn_export_hdr_file () - && be_global->conn_export_macro () != 0 - && be_global->conn_export_include () != 0) + && be_global->conn_export_macro () != nullptr + && be_global->conn_export_include () != nullptr) { this->gen_export_file ( be_global->conn_export_include (), @@ -2159,7 +2159,7 @@ TAO_CodeGen::gen_export_file (const char *filename, // Svnt export macro may correctly default to skel // export macro, so we just return silently. The // null filename check below will catch a real error. - if (macro == 0) + if (macro == nullptr) { return; } @@ -2170,7 +2170,7 @@ TAO_CodeGen::gen_export_file (const char *filename, const char *output_path = be_util::get_output_path (false, for_skel, false); - if (output_path != 0) + if (output_path != nullptr) { // Turn '\' and '\\' into '/'. char* i = const_cast<char*> (output_path); @@ -2313,7 +2313,7 @@ TAO_CodeGen::gen_ifndef_string (const char *fname, const char *extension = ACE_OS::strrchr (fname, '.'); - if (extension == 0) + if (extension == nullptr) { // File seems to have no extension, so let us take the name // as it is. @@ -2468,7 +2468,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void) { ACE_Unbounded_Queue<char *> &ts_files = idl_global->ciao_oci_ts_file_names (); - char **tmp = 0; + char **tmp = nullptr; for (ACE_Unbounded_Queue_Iterator<char *> i (ts_files); !i.done (); @@ -2640,7 +2640,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void) "tao/Versioned_Namespace.h", true); - if ((be_global->versioning_include () != 0) && (ACE_OS::strlen (be_global->versioning_include ()) > 0)) + if ((be_global->versioning_include () != nullptr) && (ACE_OS::strlen (be_global->versioning_include ()) > 0)) { this->gen_standard_include (this->client_header_, be_global->versioning_include (), @@ -3469,7 +3469,7 @@ TAO_CodeGen::gen_exec_hdr_includes (void) // generated code in the same library, using the skel export macro, // so the values for the servant export default to the skel values. // Eventually, there should be a way to completely decouple them. - if (be_global->exec_export_include () != 0) + if (be_global->exec_export_include () != nullptr) { this->gen_standard_include ( this->ciao_exec_header_, @@ -3562,7 +3562,7 @@ TAO_CodeGen::gen_exec_idl_includes (void) idl_global->stripped_filename ()->get_string ()); } - char **path_tmp = 0; + char **path_tmp = nullptr; for (ACE_Unbounded_Queue_Iterator<char *>riter ( idl_global->ciao_lem_file_names ()); @@ -3578,7 +3578,7 @@ TAO_CodeGen::gen_exec_idl_includes (void) // special case for ami4ccm, if xxxE.idl. don't include xxxAE.idl. char *exe_idl_fname = ACE_OS::strdup(exec_idl_fname); char * base = ACE_OS::strstr(exe_idl_fname, "E.idl"); - if (base != 0) + if (base != nullptr) { static char test[MAXPATHLEN]; ACE_OS::memset (test, 0, MAXPATHLEN); @@ -3586,7 +3586,7 @@ TAO_CodeGen::gen_exec_idl_includes (void) ACE_OS::strncpy(test, exe_idl_fname, base - exe_idl_fname); ACE_OS::strcat (test, "AE.idl"); - if (ACE_OS::strstr ( *path_tmp, test) != 0) + if (ACE_OS::strstr ( *path_tmp, test) != nullptr) { //skip include skip_incl = true; @@ -3618,7 +3618,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void) ACE_Unbounded_Queue<char *> &lem_file_names = idl_global->ciao_lem_file_names (); - char **path_tmp = 0; + char **path_tmp = nullptr; for (ACE_Unbounded_Queue_Iterator<char *> riter ( lem_file_names); @@ -3823,7 +3823,7 @@ TAO_CodeGen::gen_conn_ts_includes ( *this->ciao_conn_header_ << be_nl; } - char **tmp = 0; + char **tmp = nullptr; for (ACE_Unbounded_Queue_Iterator<char *> i (ts_files); !i.done (); diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp index ac4dff9851d..f9f18465a61 100644 --- a/TAO/TAO_IDL/be/be_component.cpp +++ b/TAO/TAO_IDL/be/be_component.cpp @@ -169,16 +169,16 @@ be_component::n_emits (void) const void be_component::scan (UTL_Scope *s) { - if (s == 0) + if (s == nullptr) { return; } - AST_Extended_Port *ep = 0; - AST_Mirror_Port *mp = 0; - AST_Uses *u = 0; - AST_Provides *p = 0; - AST_Attribute *a = 0; + AST_Extended_Port *ep = nullptr; + AST_Mirror_Port *mp = nullptr; + AST_Uses *u = nullptr; + AST_Provides *p = nullptr; + AST_Attribute *a = nullptr; AST_Decl::NodeType my_nt; AST_Decl::NodeType scope_nt; @@ -259,9 +259,9 @@ be_component::scan (UTL_Scope *s) } AST_Component *c = dynamic_cast<AST_Component*> (s); - AST_Interface *iface = 0; + AST_Interface *iface = nullptr; - if (c != 0) + if (c != nullptr) { for (long i = 0; i < c->n_supports (); ++i) { @@ -275,7 +275,7 @@ be_component::scan (UTL_Scope *s) // will be 0 and the call will return immediately. this->scan (c->base_component ()); } - else if ((iface = dynamic_cast<AST_Interface*> (s)) != 0) + else if ((iface = dynamic_cast<AST_Interface*> (s)) != nullptr) { for (long i = 0; i < iface->n_inherits (); ++i) { @@ -295,7 +295,7 @@ be_component::gen_stub_inheritance (TAO_OutStream *os) AST_Component *parent = this->base_component (); - if (parent != 0) + if (parent != nullptr) { *os << parent->name (); } @@ -330,7 +330,7 @@ be_component::gen_skel_inheritance (TAO_OutStream *os) { AST_Component *base = this->base_component (); - if (base != 0) + if (base != nullptr) { *os << "public virtual POA_" << base->name (); } @@ -341,7 +341,7 @@ be_component::gen_skel_inheritance (TAO_OutStream *os) long nsupports = this->n_inherits (); AST_Type **supports = this->supports (); - AST_Type *supported = 0; + AST_Type *supported = nullptr; for (long i = 0; i < nsupports; ++i) { @@ -362,7 +362,7 @@ be_component::gen_is_a_ancestors (TAO_OutStream *os) { AST_Component *ancestor = this; - while (ancestor != 0) + while (ancestor != nullptr) { *os << "std::strcmp (" << be_idt << be_idt_nl << "value," << be_nl @@ -383,9 +383,9 @@ be_component::gen_is_a_ancestors (TAO_OutStream *os) void be_component::mirror_scan (AST_PortType *pt) { - AST_Uses *u = 0; - AST_Provides *p = 0; - AST_Attribute *a = 0; + AST_Uses *u = nullptr; + AST_Provides *p = nullptr; + AST_Attribute *a = nullptr; for (UTL_ScopeActiveIterator i (pt, UTL_Scope::IK_decls); !i.is_done (); diff --git a/TAO/TAO_IDL/be/be_connector.cpp b/TAO/TAO_IDL/be/be_connector.cpp index f1dd8ed87d7..26ffe39d631 100644 --- a/TAO/TAO_IDL/be/be_connector.cpp +++ b/TAO/TAO_IDL/be/be_connector.cpp @@ -16,17 +16,17 @@ be_connector::be_connector ( n), UTL_Scope (AST_Decl::NT_connector), AST_Interface (n, + nullptr, 0, - 0, - 0, + nullptr, 0, false, false), AST_Component (n, base_connector, + nullptr, 0, - 0, - 0, + nullptr, 0), AST_Connector (n, base_connector), @@ -36,17 +36,17 @@ be_connector::be_connector ( be_type (AST_Decl::NT_connector, n), be_interface (n, + nullptr, 0, - 0, - 0, + nullptr, 0, false, false), be_component (n, base_connector, + nullptr, 0, - 0, - 0, + nullptr, 0), dds_connector_ (false), ami_connector_ (false) @@ -91,7 +91,7 @@ be_connector::check_ancestors (void) { AST_Connector *base = this; - while (base != 0) + while (base != nullptr) { const char *base_fname = base->full_name (); @@ -113,13 +113,13 @@ be_connector::check_ancestors (void) // for the moment AST_Module *m = dynamic_cast<AST_Module*> (this->defined_in ()); - AST_Template_Module_Inst *t_inst = 0; - while (t_inst == 0 && m != 0) + AST_Template_Module_Inst *t_inst = nullptr; + while (t_inst == nullptr && m != nullptr) { t_inst = m->from_inst (); m = dynamic_cast<AST_Module*> (m->defined_in ()); } - if (t_inst != 0 && t_inst->template_args () != 0) + if (t_inst != nullptr && t_inst->template_args () != nullptr) { if (t_inst->template_args ()->size () > 0) { diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp index ec9a1396e90..41dbf41a5ae 100644 --- a/TAO/TAO_IDL/be/be_decl.cpp +++ b/TAO/TAO_IDL/be/be_decl.cpp @@ -103,7 +103,7 @@ be_decl::compute_full_name (const char *prefix, const char *suffix, char *&name) { - if (prefix == 0 || suffix == 0) + if (prefix == nullptr || suffix == nullptr) { return; } @@ -113,7 +113,7 @@ be_decl::compute_full_name (const char *prefix, ACE_CString result_str; // Get parent. - if (this->defined_in () == 0) + if (this->defined_in () == nullptr) { // Global scope. @@ -132,7 +132,7 @@ be_decl::compute_full_name (const char *prefix, be_decl * const parent = dynamic_cast<be_scope*> (this->defined_in ())->decl (); - if (parent == 0) + if (parent == nullptr) { ACE_ERROR ((LM_ERROR, "(%N:%l) be_decl::" @@ -169,7 +169,7 @@ be_decl::compute_flat_name (const char *prefix, const char *suffix, char *&name) { - if (prefix == 0 || suffix == 0) + if (prefix == nullptr || suffix == nullptr) { return; } @@ -180,7 +180,7 @@ be_decl::compute_flat_name (const char *prefix, ACE_CString result_str; // Get parent. - if (this->defined_in () == 0) + if (this->defined_in () == nullptr) { // Global scope. @@ -200,7 +200,7 @@ be_decl::compute_flat_name (const char *prefix, // Get scope name. be_decl * const parent = dynamic_cast<be_scope*> (this->defined_in ())->decl (); - if (parent == 0) + if (parent == nullptr) { ACE_ERROR ((LM_ERROR, "(%N:%l) be_decl::" @@ -290,7 +290,7 @@ be_decl::scope (void) case AST_Decl::NT_home: return dynamic_cast<be_home*> (d); default: - return 0; + return nullptr; } } diff --git a/TAO/TAO_IDL/be/be_factory.cpp b/TAO/TAO_IDL/be/be_factory.cpp index 45877366438..a2187595975 100644 --- a/TAO/TAO_IDL/be/be_factory.cpp +++ b/TAO/TAO_IDL/be/be_factory.cpp @@ -61,6 +61,6 @@ be_factory::be_add_argument (AST_Argument *arg) this->add_to_scope (arg); this->add_to_referenced (arg, 0, - 0); + nullptr); return arg; } diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp index a49a1800b61..541792d3e0c 100644 --- a/TAO/TAO_IDL/be/be_generator.cpp +++ b/TAO/TAO_IDL/be/be_generator.cpp @@ -121,10 +121,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Root * be_generator::create_root (UTL_ScopedName *n) { - be_root *retval = 0; + be_root *retval = nullptr; ACE_NEW_RETURN (retval, be_root (n), - 0); + nullptr); return retval; } @@ -133,11 +133,11 @@ AST_PredefinedType * be_generator::create_predefined_type (AST_PredefinedType::PredefinedType t, UTL_ScopedName *n) { - be_predefined_type *retval = 0; + be_predefined_type *retval = nullptr; ACE_NEW_RETURN (retval, be_predefined_type (t, n), - 0); + nullptr); return retval; } @@ -146,7 +146,7 @@ AST_Module * be_generator::create_module (UTL_Scope *s, UTL_ScopedName *n) { - AST_Module *retval = 0; + AST_Module *retval = nullptr; // Check for another module of the same name in this scope. for (UTL_ScopeActiveIterator iter (s, UTL_Scope::IK_decls); @@ -161,7 +161,7 @@ be_generator::create_module (UTL_Scope *s, { // Create this new module with referance to the // "first" previous module found in scope. - ACE_NEW_RETURN (retval, be_module (n, m), 0); + ACE_NEW_RETURN (retval, be_module (n, m), nullptr); retval->prefix (const_cast<char *> (m->prefix ())); return retval; } @@ -186,7 +186,7 @@ be_generator::create_module (UTL_Scope *s, { // Create this new module with referance to the // "first" previous module found in scope. - ACE_NEW_RETURN (retval, be_module (n, m), 0); + ACE_NEW_RETURN (retval, be_module (n, m), nullptr); return retval; } } @@ -194,7 +194,7 @@ be_generator::create_module (UTL_Scope *s, } // There is no previous module to be found - ACE_NEW_RETURN (retval, be_module (n), 0); + ACE_NEW_RETURN (retval, be_module (n), nullptr); return retval; } @@ -207,7 +207,7 @@ be_generator::create_interface (UTL_ScopedName *n, bool l, bool a) { - be_interface *retval = 0; + be_interface *retval = nullptr; ACE_NEW_RETURN (retval, be_interface (n, ih, @@ -216,7 +216,7 @@ be_generator::create_interface (UTL_ScopedName *n, nih_flat, l, a), - 0); + nullptr); /// Trigger this interation over the included pragmas when the /// first local interface is seen in the main file. In an @@ -236,18 +236,18 @@ be_generator::create_interface_fwd (UTL_ScopedName *n, bool is_abstract) { AST_Interface *full_defn = this->create_interface (n, - 0, + nullptr, -1, - 0, + nullptr, 0, is_local, is_abstract); - be_interface_fwd *retval = 0; + be_interface_fwd *retval = nullptr; ACE_NEW_RETURN (retval, be_interface_fwd (full_defn, n), - 0); + nullptr); full_defn->fwd_decl (retval); return retval; @@ -257,11 +257,11 @@ AST_ValueBox * be_generator::create_valuebox (UTL_ScopedName *n, AST_Type *boxed_type) { - be_valuebox *retval = 0; + be_valuebox *retval = nullptr; ACE_NEW_RETURN (retval, be_valuebox (boxed_type, n), - 0); + nullptr); return retval; } @@ -280,7 +280,7 @@ be_generator::create_valuetype (UTL_ScopedName *n, bool is_truncatable, bool is_custom) { - be_valuetype *retval = 0; + be_valuetype *retval = nullptr; ACE_NEW_RETURN (retval, be_valuetype (n, inherits, @@ -294,7 +294,7 @@ be_generator::create_valuetype (UTL_ScopedName *n, is_abstract, is_truncatable, is_custom), - 0); + nullptr); return retval; } @@ -304,23 +304,23 @@ be_generator::create_valuetype_fwd (UTL_ScopedName *n, bool is_abstract) { AST_ValueType *full_defn = this->create_valuetype (n, - 0, + nullptr, -1, + nullptr, + nullptr, 0, + nullptr, 0, - 0, - 0, - 0, - 0, + nullptr, is_abstract, false, false); - be_valuetype_fwd *retval = 0; + be_valuetype_fwd *retval = nullptr; ACE_NEW_RETURN (retval, be_valuetype_fwd (full_defn, n), - 0); + nullptr); full_defn->fwd_decl (retval); return retval; @@ -340,7 +340,7 @@ be_generator::create_eventtype (UTL_ScopedName *n, bool is_truncatable, bool is_custom) { - be_eventtype *retval = 0; + be_eventtype *retval = nullptr; ACE_NEW_RETURN (retval, be_eventtype (n, inherits, @@ -354,7 +354,7 @@ be_generator::create_eventtype (UTL_ScopedName *n, is_abstract, is_truncatable, is_custom), - 0); + nullptr); return retval; } @@ -364,23 +364,23 @@ be_generator::create_eventtype_fwd (UTL_ScopedName *n, bool is_abstract) { AST_EventType *full_defn = this->create_eventtype (n, - 0, + nullptr, -1, + nullptr, + nullptr, 0, + nullptr, 0, - 0, - 0, - 0, - 0, + nullptr, is_abstract, false, false); - be_eventtype_fwd *retval = 0; + be_eventtype_fwd *retval = nullptr; ACE_NEW_RETURN (retval, be_eventtype_fwd (full_defn, n), - 0); + nullptr); full_defn->fwd_decl (retval); return retval; @@ -394,7 +394,7 @@ be_generator::create_component (UTL_ScopedName *n, AST_Interface **supports_flat, long n_supports_flat) { - be_component *retval = 0; + be_component *retval = nullptr; ACE_NEW_RETURN (retval, be_component (n, base_component, @@ -402,7 +402,7 @@ be_generator::create_component (UTL_ScopedName *n, n_supports, supports_flat, n_supports_flat), - 0); + nullptr); return retval; } @@ -411,17 +411,17 @@ AST_ComponentFwd * be_generator::create_component_fwd (UTL_ScopedName *n) { AST_Component *full_defn = this->create_component (n, - 0, - 0, + nullptr, + nullptr, -1, - 0, + nullptr, 0); - be_component_fwd *retval = 0; + be_component_fwd *retval = nullptr; ACE_NEW_RETURN (retval, be_component_fwd (full_defn, n), - 0); + nullptr); full_defn->fwd_decl (retval); return retval; @@ -437,7 +437,7 @@ be_generator::create_home (UTL_ScopedName *n, AST_Interface **supports_flat, long n_supports_flat) { - be_home *retval = 0; + be_home *retval = nullptr; ACE_NEW_RETURN (retval, be_home (n, base_home, @@ -447,7 +447,7 @@ be_generator::create_home (UTL_ScopedName *n, n_supports, supports_flat, n_supports_flat), - 0); + nullptr); return retval; } @@ -457,12 +457,12 @@ be_generator::create_exception (UTL_ScopedName *n, bool is_local, bool is_abstract) { - be_exception *retval = 0; + be_exception *retval = nullptr; ACE_NEW_RETURN (retval, be_exception (n, is_local, is_abstract), - 0); + nullptr); return retval; } @@ -472,12 +472,12 @@ be_generator::create_structure (UTL_ScopedName *n, bool is_local, bool is_abstract) { - be_structure *retval = 0; + be_structure *retval = nullptr; ACE_NEW_RETURN (retval, be_structure (n, is_local, is_abstract), - 0); + nullptr); return retval; } @@ -489,11 +489,11 @@ be_generator::create_structure_fwd (UTL_ScopedName *n) AST_Structure *full_defn = this->create_structure (n, false, false); - be_structure_fwd *retval = 0; + be_structure_fwd *retval = nullptr; ACE_NEW_RETURN (retval, be_structure_fwd (full_defn, n), - 0); + nullptr); full_defn->fwd_decl (retval); return retval; @@ -504,12 +504,12 @@ be_generator::create_enum (UTL_ScopedName *n, bool is_local, bool is_abstract) { - be_enum *retval = 0; + be_enum *retval = nullptr; ACE_NEW_RETURN (retval, be_enum (n, is_local, is_abstract), - 0); + nullptr); return retval; } @@ -521,14 +521,14 @@ be_generator::create_operation (AST_Type *rt, bool is_local, bool is_abstract) { - be_operation *retval = 0; + be_operation *retval = nullptr; ACE_NEW_RETURN (retval, be_operation (rt, fl, n, is_local, is_abstract), - 0); + nullptr); return retval; } @@ -538,12 +538,12 @@ be_generator::create_field (AST_Type *ft, UTL_ScopedName *n, AST_Field::Visibility vis) { - be_field *retval = 0; + be_field *retval = nullptr; ACE_NEW_RETURN (retval, be_field (ft, n, vis), - 0); + nullptr); return retval; } @@ -553,12 +553,12 @@ be_generator::create_argument (AST_Argument::Direction d, AST_Type *ft, UTL_ScopedName *n) { - be_argument *retval = 0; + be_argument *retval = nullptr; ACE_NEW_RETURN (retval, be_argument (d, ft, n), - 0); + nullptr); return retval; } @@ -570,14 +570,14 @@ be_generator::create_attribute (bool ro, bool is_local, bool is_abstract) { - be_attribute *retval = 0; + be_attribute *retval = nullptr; ACE_NEW_RETURN (retval, be_attribute (ro, ft, n, is_local, is_abstract), - 0); + nullptr); return retval; } @@ -588,13 +588,13 @@ be_generator::create_union (AST_ConcreteType *dt, bool is_local, bool is_abstract) { - be_union *retval = 0; + be_union *retval = nullptr; ACE_NEW_RETURN (retval, be_union (dt, n, is_local, is_abstract), - 0); + nullptr); return retval; } @@ -602,15 +602,15 @@ be_generator::create_union (AST_ConcreteType *dt, AST_UnionFwd * be_generator::create_union_fwd (UTL_ScopedName *n) { - AST_Union *full_defn = this->create_union (0, + AST_Union *full_defn = this->create_union (nullptr, n, false, false); - be_union_fwd *retval = 0; + be_union_fwd *retval = nullptr; ACE_NEW_RETURN (retval, be_union_fwd (full_defn, n), - 0); + nullptr); full_defn->fwd_decl (retval); return retval; @@ -621,12 +621,12 @@ be_generator::create_union_branch (UTL_LabelList *ll, AST_Type *ft, UTL_ScopedName *n) { - be_union_branch *retval = 0; + be_union_branch *retval = nullptr; ACE_NEW_RETURN (retval, be_union_branch (ll, ft, n), - 0); + nullptr); return retval; } @@ -635,11 +635,11 @@ AST_UnionLabel * be_generator::create_union_label (AST_UnionLabel::UnionLabel ul, AST_Expression *lv) { - be_union_label *retval = 0; + be_union_label *retval = nullptr; ACE_NEW_RETURN (retval, be_union_label (ul, lv), - 0); + nullptr); return retval; } @@ -649,12 +649,12 @@ be_generator::create_constant (AST_Expression::ExprType et, AST_Expression *ev, UTL_ScopedName *n) { - be_constant *retval = 0; + be_constant *retval = nullptr; ACE_NEW_RETURN (retval, be_constant (et, ev, n), - 0); + nullptr); return retval; } @@ -662,10 +662,10 @@ be_generator::create_constant (AST_Expression::ExprType et, AST_Expression * be_generator::create_expr (UTL_ScopedName *n) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (n), - 0); + nullptr); return retval; } @@ -674,11 +674,11 @@ AST_Expression * be_generator::create_expr (AST_Expression *b, AST_Expression::ExprType t) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (b, t), - 0); + nullptr); return retval; } @@ -688,12 +688,12 @@ be_generator::create_expr (AST_Expression::ExprComb c, AST_Expression *v1, AST_Expression *v2) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (c, v1, v2), - 0); + nullptr); return retval; } @@ -701,10 +701,10 @@ be_generator::create_expr (AST_Expression::ExprComb c, AST_Expression * be_generator::create_expr (ACE_CDR::Long l) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (l), - 0); + nullptr); return retval; } @@ -712,10 +712,10 @@ be_generator::create_expr (ACE_CDR::Long l) AST_Expression * be_generator::create_expr (ACE_CDR::LongLong l) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (l), - 0); + nullptr); return retval; } @@ -723,10 +723,10 @@ be_generator::create_expr (ACE_CDR::LongLong l) AST_Expression * be_generator::create_expr (ACE_CDR::Boolean b) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (b), - 0); + nullptr); return retval; } @@ -734,10 +734,10 @@ be_generator::create_expr (ACE_CDR::Boolean b) AST_Expression * be_generator::create_expr (ACE_CDR::ULong l) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (l), - 0); + nullptr); return retval; } @@ -745,10 +745,10 @@ be_generator::create_expr (ACE_CDR::ULong l) AST_Expression * be_generator::create_expr (ACE_CDR::ULongLong l) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (l), - 0); + nullptr); return retval; } @@ -757,10 +757,10 @@ AST_Expression * be_generator::create_expr (ACE_CDR::ULong l, AST_Expression::ExprType t) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (l, t), - 0); + nullptr); return retval; } @@ -768,10 +768,10 @@ be_generator::create_expr (ACE_CDR::ULong l, AST_Expression * be_generator::create_expr (UTL_String *s) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (s), - 0); + nullptr); return retval; } @@ -779,10 +779,10 @@ be_generator::create_expr (UTL_String *s) AST_Expression * be_generator::create_expr (ACE_CDR::Char c) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (c), - 0); + nullptr); return retval; } @@ -790,10 +790,10 @@ be_generator::create_expr (ACE_CDR::Char c) AST_Expression * be_generator::create_expr (ACE_OutputCDR::from_wchar wc) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (wc), - 0); + nullptr); return retval; } @@ -801,10 +801,10 @@ be_generator::create_expr (ACE_OutputCDR::from_wchar wc) AST_Expression * be_generator::create_expr (char *s) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (s), - 0); + nullptr); return retval; } @@ -812,10 +812,10 @@ be_generator::create_expr (char *s) AST_Expression * be_generator::create_expr (ACE_CDR::Double d) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (d), - 0); + nullptr); return retval; } @@ -823,10 +823,10 @@ be_generator::create_expr (ACE_CDR::Double d) AST_Expression * be_generator::create_expr (const ACE_CDR::Fixed &f) { - be_expression *retval = 0; + be_expression *retval = nullptr; ACE_NEW_RETURN (retval, be_expression (f), - 0); + nullptr); return retval; } @@ -835,11 +835,11 @@ AST_EnumVal * be_generator::create_enum_val (ACE_CDR::ULong v, UTL_ScopedName *n) { - be_enum_val *retval = 0; + be_enum_val *retval = nullptr; ACE_NEW_RETURN (retval, be_enum_val (v, n), - 0); + nullptr); return retval; } @@ -851,14 +851,14 @@ be_generator::create_array (UTL_ScopedName *n, bool is_local, bool is_abstract) { - be_array *retval = 0; + be_array *retval = nullptr; ACE_NEW_RETURN (retval, be_array (n, ndims, dims, is_local, is_abstract), - 0); + nullptr); return retval; } @@ -870,14 +870,14 @@ be_generator::create_sequence (AST_Expression *v, bool is_local, bool is_abstract) { - be_sequence *retval = 0; + be_sequence *retval = nullptr; ACE_NEW_RETURN (retval, be_sequence (v, bt, n, is_local, is_abstract), - 0); + nullptr); return retval; } @@ -887,15 +887,15 @@ be_generator::create_string (AST_Expression *v) { Identifier id ("string"); UTL_ScopedName n (&id, - 0); + nullptr); - be_string *retval = 0; + be_string *retval = nullptr; ACE_NEW_RETURN (retval, be_string (AST_Decl::NT_string, &n, v, 1), - 0); + nullptr); return retval; } @@ -907,18 +907,18 @@ be_generator::create_wstring (AST_Expression *v) ? "string" : "wstring"); UTL_ScopedName n (&id, - 0); + nullptr); AST_Decl::NodeType nt = sizeof (ACE_CDR::WChar) == 1 ? AST_Decl::NT_string : AST_Decl::NT_wstring; - be_string *retval = 0; + be_string *retval = nullptr; ACE_NEW_RETURN (retval, be_string (nt, &n, v, sizeof (ACE_CDR::WChar)), - 0); + nullptr); return retval; } @@ -928,9 +928,9 @@ be_generator::create_fixed (AST_Expression *digits, AST_Expression *scale) { Identifier id ("fixed"); - UTL_ScopedName name (&id, 0); - AST_Fixed *retval = 0; - ACE_NEW_RETURN (retval, be_fixed (&name, digits, scale), 0); + UTL_ScopedName name (&id, nullptr); + AST_Fixed *retval = nullptr; + ACE_NEW_RETURN (retval, be_fixed (&name, digits, scale), nullptr); return retval; } @@ -940,13 +940,13 @@ be_generator::create_typedef (AST_Type *bt, bool is_local, bool is_abstract) { - be_typedef *retval = 0; + be_typedef *retval = nullptr; ACE_NEW_RETURN (retval, be_typedef (bt, n, is_local, is_abstract), - 0); + nullptr); return retval; } @@ -954,10 +954,10 @@ be_generator::create_typedef (AST_Type *bt, AST_Native * be_generator::create_native (UTL_ScopedName *n) { - be_native *retval = 0; + be_native *retval = nullptr; ACE_NEW_RETURN (retval, be_native (n), - 0); + nullptr); return retval; } @@ -965,10 +965,10 @@ be_generator::create_native (UTL_ScopedName *n) AST_Factory * be_generator::create_factory (UTL_ScopedName *n) { - be_factory *retval = 0; + be_factory *retval = nullptr; ACE_NEW_RETURN (retval, be_factory (n), - 0); + nullptr); return retval; } @@ -976,10 +976,10 @@ be_generator::create_factory (UTL_ScopedName *n) AST_Finder * be_generator::create_finder (UTL_ScopedName *n) { - be_finder *retval = 0; + be_finder *retval = nullptr; ACE_NEW_RETURN (retval, be_finder (n), - 0); + nullptr); return retval; } @@ -987,10 +987,10 @@ be_generator::create_finder (UTL_ScopedName *n) AST_PortType * be_generator::create_porttype (UTL_ScopedName *n) { - be_porttype *retval = 0; + be_porttype *retval = nullptr; ACE_NEW_RETURN (retval, be_porttype (n), - 0); + nullptr); return retval; } @@ -999,11 +999,11 @@ AST_Provides * be_generator::create_provides (UTL_ScopedName *n, AST_Type *provides_type) { - be_provides *retval = 0; + be_provides *retval = nullptr; ACE_NEW_RETURN (retval, be_provides (n, provides_type), - 0); + nullptr); return retval; } @@ -1013,12 +1013,12 @@ be_generator::create_uses (UTL_ScopedName *n, AST_Type *uses_type, bool is_multiple) { - be_uses *retval = 0; + be_uses *retval = nullptr; ACE_NEW_RETURN (retval, be_uses (n, uses_type, is_multiple), - 0); + nullptr); return retval; } @@ -1027,11 +1027,11 @@ AST_Publishes * be_generator::create_publishes (UTL_ScopedName *n, AST_Type *publishes_type) { - be_publishes *retval = 0; + be_publishes *retval = nullptr; ACE_NEW_RETURN (retval, be_publishes (n, publishes_type), - 0); + nullptr); return retval; } @@ -1040,11 +1040,11 @@ AST_Emits * be_generator::create_emits (UTL_ScopedName *n, AST_Type *emits_type) { - be_emits *retval = 0; + be_emits *retval = nullptr; ACE_NEW_RETURN (retval, be_emits (n, emits_type), - 0); + nullptr); return retval; } @@ -1052,11 +1052,11 @@ AST_Consumes * be_generator::create_consumes (UTL_ScopedName *n, AST_Type *consumes_type) { - be_consumes *retval = 0; + be_consumes *retval = nullptr; ACE_NEW_RETURN (retval, be_consumes (n, consumes_type), - 0); + nullptr); return retval; } @@ -1066,11 +1066,11 @@ be_generator::create_extended_port ( UTL_ScopedName *n, AST_PortType *porttype_ref) { - be_extended_port *retval = 0; + be_extended_port *retval = nullptr; ACE_NEW_RETURN (retval, be_extended_port (n, porttype_ref), - 0); + nullptr); return retval; } @@ -1080,11 +1080,11 @@ be_generator::create_mirror_port ( UTL_ScopedName *n, AST_PortType *porttype_ref) { - be_mirror_port *retval = 0; + be_mirror_port *retval = nullptr; ACE_NEW_RETURN (retval, be_mirror_port (n, porttype_ref), - 0); + nullptr); return retval; } @@ -1094,11 +1094,11 @@ be_generator::create_connector ( UTL_ScopedName *n, AST_Connector *base_connector) { - be_connector *retval = 0; + be_connector *retval = nullptr; ACE_NEW_RETURN (retval, be_connector (n, base_connector), - 0); + nullptr); return retval; } @@ -1108,11 +1108,11 @@ be_generator::create_template_module ( UTL_ScopedName *n, FE_Utils::T_PARAMLIST_INFO *template_params) { - be_template_module *retval = 0; + be_template_module *retval = nullptr; ACE_NEW_RETURN (retval, be_template_module (n, template_params), - 0); + nullptr); return retval; } @@ -1123,12 +1123,12 @@ be_generator::create_template_module_inst ( AST_Template_Module *ref, FE_Utils::T_ARGLIST *template_args) { - be_template_module_inst *retval = 0; + be_template_module_inst *retval = nullptr; ACE_NEW_RETURN (retval, be_template_module_inst (n, ref, template_args), - 0); + nullptr); return retval; } @@ -1139,12 +1139,12 @@ be_generator::create_template_module_ref ( AST_Template_Module *ref, UTL_StrList *param_refs) { - be_template_module_ref *retval = 0; + be_template_module_ref *retval = nullptr; ACE_NEW_RETURN (retval, be_template_module_ref (n, ref, param_refs), - 0); + nullptr); return retval; } @@ -1154,11 +1154,11 @@ be_generator::create_param_holder ( UTL_ScopedName *parameter_name, FE_Utils::T_Param_Info *info) { - be_param_holder *retval = 0; + be_param_holder *retval = nullptr; ACE_NEW_RETURN (retval, be_param_holder (parameter_name, info), - 0); + nullptr); return retval; } diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 54678f6b317..2c959f8ed43 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -30,31 +30,31 @@ #include "ace/OS_NS_sys_stat.h" #include "ace/OS_NS_ctype.h" -TAO_IDL_BE_Export BE_GlobalData *be_global = 0; +TAO_IDL_BE_Export BE_GlobalData *be_global = nullptr; BE_GlobalData::BE_GlobalData (void) : changing_standard_include_files_ (1), - skel_export_macro_ (0), - skel_export_include_ (0), - skel_export_file_ (0), - stub_export_macro_ (0), - stub_export_include_ (0), - stub_export_file_ (0), - anyop_export_macro_ (0), - anyop_export_include_ (0), - exec_export_macro_ (0), - exec_export_include_ (0), - svnt_export_macro_ (0), - svnt_export_include_ (0), - conn_export_macro_ (0), - conn_export_include_ (0), - pch_include_ (0), - pre_include_ (0), - post_include_ (0), - include_guard_ (0), - safe_include_ (0), - unique_include_ (0), - stripped_filename_ (0), + skel_export_macro_ (nullptr), + skel_export_include_ (nullptr), + skel_export_file_ (nullptr), + stub_export_macro_ (nullptr), + stub_export_include_ (nullptr), + stub_export_file_ (nullptr), + anyop_export_macro_ (nullptr), + anyop_export_include_ (nullptr), + exec_export_macro_ (nullptr), + exec_export_include_ (nullptr), + svnt_export_macro_ (nullptr), + svnt_export_include_ (nullptr), + conn_export_macro_ (nullptr), + conn_export_include_ (nullptr), + pch_include_ (nullptr), + pre_include_ (nullptr), + post_include_ (nullptr), + include_guard_ (nullptr), + safe_include_ (nullptr), + unique_include_ (nullptr), + stripped_filename_ (nullptr), core_versioning_begin_ ("\nTAO_BEGIN_VERSIONED_NAMESPACE_DECL\n"), core_versioning_end_ ("\nTAO_END_VERSIONED_NAMESPACE_DECL\n"), versioning_begin_ (), @@ -88,11 +88,11 @@ BE_GlobalData::BE_GlobalData (void) ciao_ami_conn_impl_hdr_ending_ (ACE::strnew ("_conn_i.h")), ciao_ami_conn_impl_src_ending_ (ACE::strnew ("_conn_i.cpp")), ciao_container_type_ (ACE::strnew ("Session")), - output_dir_ (0), - stub_include_dir_ (0), - skel_output_dir_ (0), - anyop_output_dir_ (0), - exec_output_dir_ (0), + output_dir_ (nullptr), + stub_include_dir_ (nullptr), + skel_output_dir_ (nullptr), + anyop_output_dir_ (nullptr), + exec_output_dir_ (nullptr), any_support_ (true), cdr_support_ (true), tc_support_ (true), @@ -118,11 +118,11 @@ BE_GlobalData::BE_GlobalData (void) gen_empty_anyop_header_ (false), lookup_strategy_ (TAO_PERFECT_HASH), dds_impl_ (DDS_NONE), - void_type_ (0), - ccmobject_ (0), - messaging_ (0), - messaging_exceptionholder_ (0), - messaging_replyhandler_ (0), + void_type_ (nullptr), + ccmobject_ (nullptr), + messaging_ (nullptr), + messaging_exceptionholder_ (nullptr), + messaging_replyhandler_ (nullptr), gen_anyop_files_ (false), gen_skel_files_ (true), gen_svnt_cpp_files_ (true), @@ -192,9 +192,9 @@ be_change_idl_file_extension (UTL_String* idl_file, { // @@ This shouldn't happen anyway; but a better error handling // mechanism is needed. - if (idl_file == 0 || new_extension == 0) + if (idl_file == nullptr || new_extension == nullptr) { - return 0; + return nullptr; } static char fname[MAXPATHLEN]; @@ -205,7 +205,7 @@ be_change_idl_file_extension (UTL_String* idl_file, // Get the base part of the filename, we try several extensions // before giving up. - const char *base = 0; + const char *base = nullptr; static const char* extensions[] = { ".idl", @@ -220,22 +220,22 @@ be_change_idl_file_extension (UTL_String* idl_file, { base = ACE_OS::strstr (string, extensions[k]); - if (base != 0) + if (base != nullptr) { break; } } - if (base == 0) + if (base == nullptr) { - return 0; + return nullptr; } // Anyop * skel file output defaults to general output dir if not set. const char *output_path = be_util::get_output_path (for_anyop, for_skel, for_exec); - if (!base_name_only && output_path != 0) + if (!base_name_only && output_path != nullptr) { // Path info should also be added to fname. @@ -810,7 +810,7 @@ BE_GlobalData::be_get_ciao_ami_conn_impl_src_fname ( const char* BE_GlobalData::skel_export_macro (void) const { - if (this->skel_export_macro_ == 0) + if (this->skel_export_macro_ == nullptr) { return ""; } @@ -854,7 +854,7 @@ BE_GlobalData::skel_export_file (const char *s) const char* BE_GlobalData::stub_export_macro (void) const { - if (this->stub_export_macro_ == 0) + if (this->stub_export_macro_ == nullptr) { return ""; } @@ -898,7 +898,7 @@ BE_GlobalData::stub_export_file (const char *s) const char* BE_GlobalData::anyop_export_macro (void) const { - if (this->anyop_export_macro_ == 0) + if (this->anyop_export_macro_ == nullptr) { return ""; } @@ -929,7 +929,7 @@ BE_GlobalData::anyop_export_include (const char *s) const char* BE_GlobalData::exec_export_macro (void) const { - if (this->exec_export_macro_ == 0) + if (this->exec_export_macro_ == nullptr) { return ""; } @@ -960,7 +960,7 @@ BE_GlobalData::exec_export_include (const char *s) const char* BE_GlobalData::svnt_export_macro (void) const { - if (this->svnt_export_macro_ == 0) + if (this->svnt_export_macro_ == nullptr) { return ""; } @@ -991,7 +991,7 @@ BE_GlobalData::svnt_export_include (const char *s) const char* BE_GlobalData::conn_export_macro (void) const { - if (this->conn_export_macro_ == 0) + if (this->conn_export_macro_ == nullptr) { return ""; } @@ -1957,7 +1957,7 @@ BE_GlobalData::lookup_strategy (void) const void BE_GlobalData::dds_impl (char const * const val) { - ACE_CString tmp (val, 0, false); + ACE_CString tmp (val, nullptr, false); if (tmp == "ndds") { @@ -1995,189 +1995,189 @@ void BE_GlobalData::destroy (void) { ACE::strdelete (this->skel_export_macro_); - this->skel_export_macro_ = 0; + this->skel_export_macro_ = nullptr; ACE::strdelete (this->skel_export_include_); - this->skel_export_include_ = 0; + this->skel_export_include_ = nullptr; ACE::strdelete (this->skel_export_file_); - this->skel_export_file_ = 0; + this->skel_export_file_ = nullptr; ACE::strdelete (this->stub_export_macro_); - this->stub_export_macro_ = 0; + this->stub_export_macro_ = nullptr; ACE::strdelete (this->stub_export_include_); - this->stub_export_include_ = 0; + this->stub_export_include_ = nullptr; ACE::strdelete (this->stub_export_file_); - this->stub_export_file_ = 0; + this->stub_export_file_ = nullptr; ACE::strdelete (this->anyop_export_macro_); - this->anyop_export_macro_ = 0; + this->anyop_export_macro_ = nullptr; ACE::strdelete (this->anyop_export_include_); - this->anyop_export_include_ = 0; + this->anyop_export_include_ = nullptr; ACE::strdelete (this->exec_export_macro_); - this->exec_export_macro_ = 0; + this->exec_export_macro_ = nullptr; ACE::strdelete (this->exec_export_include_); - this->exec_export_include_ = 0; + this->exec_export_include_ = nullptr; ACE::strdelete (this->svnt_export_macro_); - this->svnt_export_macro_ = 0; + this->svnt_export_macro_ = nullptr; ACE::strdelete (this->svnt_export_include_); - this->svnt_export_include_ = 0; + this->svnt_export_include_ = nullptr; ACE::strdelete (this->conn_export_macro_); - this->conn_export_macro_ = 0; + this->conn_export_macro_ = nullptr; ACE::strdelete (this->conn_export_include_); - this->conn_export_include_ = 0; + this->conn_export_include_ = nullptr; ACE::strdelete (this->pch_include_); - this->pch_include_ = 0; + this->pch_include_ = nullptr; ACE::strdelete (this->pre_include_); - this->pre_include_ = 0; + this->pre_include_ = nullptr; ACE::strdelete (this->post_include_); - this->post_include_ = 0; + this->post_include_ = nullptr; ACE::strdelete (this->include_guard_); - this->include_guard_ = 0; + this->include_guard_ = nullptr; ACE::strdelete (this->safe_include_); - this->safe_include_ = 0; + this->safe_include_ = nullptr; ACE::strdelete (this->unique_include_); - this->unique_include_ = 0; + this->unique_include_ = nullptr; ACE::strdelete (this->stripped_filename_); - this->stripped_filename_ = 0; + this->stripped_filename_ = nullptr; ACE::strdelete (this->client_hdr_ending_); - this->client_hdr_ending_ = 0; + this->client_hdr_ending_ = nullptr; ACE::strdelete (this->client_stub_ending_); - this->client_stub_ending_ = 0; + this->client_stub_ending_ = nullptr; ACE::strdelete (this->client_inline_ending_); - this->client_inline_ending_ = 0; + this->client_inline_ending_ = nullptr; ACE::strdelete (this->server_hdr_ending_); - this->server_hdr_ending_ = 0; + this->server_hdr_ending_ = nullptr; ACE::strdelete (this->implementation_hdr_ending_); - this->implementation_hdr_ending_ = 0; + this->implementation_hdr_ending_ = nullptr; ACE::strdelete (this->implementation_skel_ending_); - this->implementation_skel_ending_ = 0; + this->implementation_skel_ending_ = nullptr; ACE::strdelete (this->impl_class_prefix_); - this->impl_class_prefix_ = 0; + this->impl_class_prefix_ = nullptr; ACE::strdelete (this->impl_class_suffix_); - this->impl_class_suffix_ = 0; + this->impl_class_suffix_ = nullptr; ACE::strdelete (this->server_template_hdr_ending_); - this->server_template_hdr_ending_ = 0; + this->server_template_hdr_ending_ = nullptr; ACE::strdelete (this->server_skeleton_ending_); - this->server_skeleton_ending_ = 0; + this->server_skeleton_ending_ = nullptr; ACE::strdelete (this->server_template_skeleton_ending_); - this->server_template_skeleton_ending_ = 0; + this->server_template_skeleton_ending_ = nullptr; ACE::strdelete (this->anyop_hdr_ending_); - this->anyop_hdr_ending_ = 0; + this->anyop_hdr_ending_ = nullptr; ACE::strdelete (this->anyop_src_ending_); - this->anyop_src_ending_ = 0; + this->anyop_src_ending_ = nullptr; ACE::strdelete (this->ciao_svnt_hdr_ending_); - this->ciao_svnt_hdr_ending_ = 0; + this->ciao_svnt_hdr_ending_ = nullptr; ACE::strdelete (this->ciao_svnt_src_ending_); - this->ciao_svnt_src_ending_ = 0; + this->ciao_svnt_src_ending_ = nullptr; ACE::strdelete (this->ciao_svnt_hdr_template_ending_); - this->ciao_svnt_hdr_template_ending_ = 0; + this->ciao_svnt_hdr_template_ending_ = nullptr; ACE::strdelete (this->ciao_svnt_src_template_ending_); - this->ciao_svnt_src_template_ending_ = 0; + this->ciao_svnt_src_template_ending_ = nullptr; ACE::strdelete (this->ciao_exec_hdr_ending_); - this->ciao_exec_hdr_ending_ = 0; + this->ciao_exec_hdr_ending_ = nullptr; ACE::strdelete (this->ciao_exec_src_ending_); - this->ciao_exec_src_ending_ = 0; + this->ciao_exec_src_ending_ = nullptr; ACE::strdelete (this->ciao_exec_stub_hdr_ending_); - this->ciao_exec_stub_hdr_ending_ = 0; + this->ciao_exec_stub_hdr_ending_ = nullptr; ACE::strdelete (this->ciao_exec_idl_ending_); - this->ciao_exec_idl_ending_ = 0; + this->ciao_exec_idl_ending_ = nullptr; ACE::strdelete (this->ciao_conn_hdr_ending_); - this->ciao_conn_hdr_ending_ = 0; + this->ciao_conn_hdr_ending_ = nullptr; ACE::strdelete (this->ciao_conn_src_ending_); - this->ciao_conn_src_ending_ = 0; + this->ciao_conn_src_ending_ = nullptr; ACE::strdelete (this->dds_typesupport_hdr_ending_); - this->dds_typesupport_hdr_ending_ = 0; + this->dds_typesupport_hdr_ending_ = nullptr; ACE::strdelete (this->ciao_ami_conn_idl_ending_); - this->ciao_ami_conn_idl_ending_ = 0; + this->ciao_ami_conn_idl_ending_ = nullptr; ACE::strdelete (this->ciao_ami_conn_impl_hdr_ending_); - this->ciao_ami_conn_impl_hdr_ending_ = 0; + this->ciao_ami_conn_impl_hdr_ending_ = nullptr; ACE::strdelete (this->ciao_ami_conn_impl_src_ending_); - this->ciao_ami_conn_impl_src_ending_ = 0; + this->ciao_ami_conn_impl_src_ending_ = nullptr; ACE::strdelete (this->ciao_container_type_); - this->ciao_container_type_ = 0; + this->ciao_container_type_ = nullptr; ACE::strdelete (this->output_dir_); - this->output_dir_ = 0; + this->output_dir_ = nullptr; ACE::strdelete (this->stub_include_dir_); - this->stub_include_dir_ = 0; + this->stub_include_dir_ = nullptr; ACE::strdelete (this->skel_output_dir_); - this->skel_output_dir_ = 0; + this->skel_output_dir_ = nullptr; ACE::strdelete (this->anyop_output_dir_); - this->anyop_output_dir_ = 0; + this->anyop_output_dir_ = nullptr; ACE::strdelete (this->exec_output_dir_); - this->exec_output_dir_ = 0; + this->exec_output_dir_ = nullptr; - if (0 != this->messaging_) + if (nullptr != this->messaging_) { this->messaging_->destroy (); delete this->messaging_; - this->messaging_ = 0; + this->messaging_ = nullptr; } - if (0 != this->messaging_exceptionholder_) + if (nullptr != this->messaging_exceptionholder_) { this->messaging_exceptionholder_->destroy (); delete this->messaging_exceptionholder_; - this->messaging_exceptionholder_ = 0; + this->messaging_exceptionholder_ = nullptr; } - if (0 != this->messaging_replyhandler_) + if (nullptr != this->messaging_replyhandler_) { this->messaging_replyhandler_->destroy (); delete this->messaging_replyhandler_; - this->messaging_replyhandler_ = 0; + this->messaging_replyhandler_ = nullptr; } - if (0 != tao_cg) + if (nullptr != tao_cg) { tao_cg->destroy (); } @@ -2186,7 +2186,7 @@ BE_GlobalData::destroy (void) AST_PredefinedType * BE_GlobalData:: void_type (void) { - if (0 == this->void_type_) + if (nullptr == this->void_type_) { AST_Decl *d = idl_global->root ()->lookup_primitive_type ( @@ -2201,21 +2201,21 @@ BE_GlobalData:: void_type (void) be_interface * BE_GlobalData::ccmobject (void) { - if (0 == this->ccmobject_) + if (nullptr == this->ccmobject_) { - Identifier *local_id = 0; + Identifier *local_id = nullptr; ACE_NEW_RETURN (local_id, Identifier ("CCMObject"), - 0); - UTL_ScopedName *local_name = 0; + nullptr); + UTL_ScopedName *local_name = nullptr; ACE_NEW_RETURN (local_name, - UTL_ScopedName (local_id, 0), - 0); + UTL_ScopedName (local_id, nullptr), + nullptr); - Identifier *module_id = 0; + Identifier *module_id = nullptr; ACE_NEW_RETURN (module_id, Identifier ("Components"), - 0); + nullptr); UTL_ScopedName sn (module_id, local_name); @@ -2225,7 +2225,7 @@ BE_GlobalData::ccmobject (void) sn.destroy (); - if (0 == d) + if (nullptr == d) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_global::ccmobject - " @@ -2242,23 +2242,23 @@ BE_GlobalData::ccmobject (void) be_module * BE_GlobalData::messaging (void) { - if (0 == this->messaging_) + if (nullptr == this->messaging_) { - Identifier *id = 0; - UTL_ScopedName *sn = 0; + Identifier *id = nullptr; + UTL_ScopedName *sn = nullptr; ACE_NEW_RETURN (id, Identifier ("Messaging"), - 0); + nullptr); ACE_NEW_RETURN (sn, UTL_ScopedName (id, - 0), - 0); + nullptr), + nullptr); ACE_NEW_RETURN (this->messaging_, be_module (sn), - 0); + nullptr); this->messaging_->set_name (sn); } @@ -2269,50 +2269,50 @@ BE_GlobalData::messaging (void) be_valuetype * BE_GlobalData::messaging_exceptionholder (void) { - if (0 == this->messaging_exceptionholder_) + if (nullptr == this->messaging_exceptionholder_) { - Identifier *id = 0; + Identifier *id = nullptr; be_module *msg = this->messaging (); idl_global->scopes ().push (msg); ACE_NEW_RETURN (id, Identifier ("Messaging"), - 0); + nullptr); // Create a valuetype "ExceptionHolder" // from which we inherit. - UTL_ScopedName *full_name = 0; + UTL_ScopedName *full_name = nullptr; ACE_NEW_RETURN (full_name, UTL_ScopedName (id, - 0), - 0); + nullptr), + nullptr); ACE_NEW_RETURN (id, Identifier ("ExceptionHolder"), - 0); + nullptr); - UTL_ScopedName *local_name = 0; + UTL_ScopedName *local_name = nullptr; ACE_NEW_RETURN (local_name, UTL_ScopedName (id, - 0), - 0); + nullptr), + nullptr); full_name->nconc (local_name); ACE_NEW_RETURN (this->messaging_exceptionholder_, be_valuetype (full_name, + nullptr, 0, + nullptr, + nullptr, 0, + nullptr, 0, - 0, - 0, - 0, - 0, - 0, + nullptr, 0, 0, 0), - 0); + nullptr); this->messaging_exceptionholder_->set_name (full_name); @@ -2334,47 +2334,47 @@ BE_GlobalData::messaging_exceptionholder (void) be_interface * BE_GlobalData::messaging_replyhandler (void) { - if (0 == this->messaging_replyhandler_) + if (nullptr == this->messaging_replyhandler_) { be_module *msg = this->messaging (); idl_global->scopes ().push (msg); - Identifier *id = 0; - UTL_ScopedName *local_name = 0; + Identifier *id = nullptr; + UTL_ScopedName *local_name = nullptr; // Create a virtual module named "Messaging" // "and an interface "ReplyHandler" // from which we inherit. ACE_NEW_RETURN (id, Identifier ("Messaging"), - 0); + nullptr); - UTL_ScopedName *full_name = 0; + UTL_ScopedName *full_name = nullptr; ACE_NEW_RETURN (full_name, UTL_ScopedName (id, - 0), - 0); + nullptr), + nullptr); ACE_NEW_RETURN (id, Identifier ("ReplyHandler"), - 0); + nullptr); ACE_NEW_RETURN (local_name, UTL_ScopedName (id, - 0), - 0); + nullptr), + nullptr); full_name->nconc (local_name); ACE_NEW_RETURN (this->messaging_replyhandler_, be_interface (full_name, - 0, // inherited interfaces + nullptr, // inherited interfaces 0, // number of inherited interfaces - 0, // ancestors + nullptr, // ancestors 0, // number of ancestors 0, // not local 0), // not abstract - 0); + nullptr); this->messaging_replyhandler_->set_name (full_name); this->messaging_replyhandler_->set_prefix_with_typeprefix ("omg.org"); @@ -2902,7 +2902,7 @@ BE_GlobalData::parse_args (long &i, char **av) case 'H': idl_global->append_idl_flag (av[i + 1]); - if (av[i + 1] == 0 || av[i + 1][0] == '-') + if (av[i + 1] == nullptr || av[i + 1][0] == '-') { ACE_ERROR ((LM_ERROR, ACE_TEXT ("no selection for -H option\n"))); @@ -2981,7 +2981,7 @@ BE_GlobalData::parse_args (long &i, char **av) if (av[i][2] == '\0') { idl_global->append_idl_flag (av[i + 1]); - ACE_CString tmp (av[i + 1], 0, false); + ACE_CString tmp (av[i + 1], nullptr, false); #if defined (ACE_WIN32) // WIN32's CreateProcess needs the full executable name // when the gperf path is modified, but not for the default @@ -3713,7 +3713,7 @@ BE_GlobalData::parse_args (long &i, char **av) case 'T': if (av[i][2] == 'S') { - unsigned long ul = ACE_OS::strtoul (av[i + 1], 0, 10); + unsigned long ul = ACE_OS::strtoul (av[i + 1], nullptr, 10); be_global->tab_size (ul); ++i; } diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp index b62ed54a062..47629c91ddd 100644 --- a/TAO/TAO_IDL/be/be_helper.cpp +++ b/TAO/TAO_IDL/be/be_helper.cpp @@ -76,7 +76,7 @@ const TAO_UNINDENT be_uidt_nl (1); // Methods of the TAO_OutStream class. TAO_OutStream::TAO_OutStream (void) - : fp_ (0), + : fp_ (nullptr), st_ (TAO_CLI_HDR), indent_level_ (0) { @@ -89,10 +89,10 @@ TAO_OutStream::TAO_OutStream (void) TAO_OutStream::~TAO_OutStream (void) { // Close the underlying I/O handle only if it exists. - if (this->fp_ != 0) + if (this->fp_ != nullptr) { ACE_OS::fclose (this->fp_); - this->fp_ = 0; + this->fp_ = nullptr; } indent_level_ = 0; @@ -102,12 +102,12 @@ int TAO_OutStream::open (const char *fname, TAO_OutStream::STREAM_TYPE st) { - if (fname != 0) + if (fname != nullptr) { // File name exists, open an I/O file handle. this->fp_ = ACE_OS::fopen (fname, "w"); - if (this->fp_ != 0) + if (this->fp_ != nullptr) { this->st_ = st; // Put the copyright notice. Not for the gperf's temp input @@ -239,7 +239,7 @@ TAO_OutStream::gen_ifdef_macro (const char *flat_name, "_%s_", tao_cg->upcase (flat_name)); - if (suffix != 0) + if (suffix != nullptr) { ACE_OS::strcat (macro, "_"); ACE_OS::strcat (macro, tao_cg->upcase (suffix)); @@ -464,7 +464,7 @@ TAO_OutStream::print (UTL_IdList *idl) { bool first = true; bool second = false; - Identifier *id = 0; + Identifier *id = nullptr; for (UTL_IdListActiveIterator i (idl); !i.is_done (); i.next ()) { @@ -505,7 +505,7 @@ TAO_OutStream::print (AST_Expression *expr) AST_Expression::AST_ExprValue *ev = expr->ev (); /// Never happens as far as I know, but just in case... - if (ev == 0) + if (ev == nullptr) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO_OutStream::print() - ") diff --git a/TAO/TAO_IDL/be/be_home.cpp b/TAO/TAO_IDL/be/be_home.cpp index 9f56f01b0c0..2e802998aa6 100644 --- a/TAO/TAO_IDL/be/be_home.cpp +++ b/TAO/TAO_IDL/be/be_home.cpp @@ -66,7 +66,7 @@ be_home::be_home (UTL_ScopedName *n, // Some previous error may have caused a lookup failure, in which // case we'll crash if we do the narrow below. - if (managed_component == 0) + if (managed_component == nullptr) { idl_global->set_err_count (idl_global->err_count () + 1); return; @@ -87,7 +87,7 @@ be_home::~be_home (void) void be_home::scan (UTL_Scope *s) { - if (s == 0) + if (s == nullptr) { return; } @@ -100,7 +100,7 @@ be_home::scan (UTL_Scope *s) AST_Attribute *attr = dynamic_cast<AST_Attribute*> (d); - if (attr != 0 && ! attr->readonly ()) + if (attr != nullptr && ! attr->readonly ()) { this->has_rw_attributes_ = true; return; @@ -109,7 +109,7 @@ be_home::scan (UTL_Scope *s) AST_Home *h = dynamic_cast<AST_Home*> (s); - if (h != 0) + if (h != nullptr) { this->scan (h->base_home ()); } @@ -119,34 +119,34 @@ void be_home::destroy (void) { delete [] this->full_skel_name_; - this->full_skel_name_ = 0; + this->full_skel_name_ = nullptr; delete [] this->full_coll_name_; - this->full_coll_name_ = 0; + this->full_coll_name_ = nullptr; delete [] this->local_coll_name_; - this->local_coll_name_ = 0; + this->local_coll_name_ = nullptr; delete [] this->relative_skel_name_; - this->relative_skel_name_ = 0; + this->relative_skel_name_ = nullptr; delete [] this->direct_proxy_impl_name_; - this->direct_proxy_impl_name_ = 0; + this->direct_proxy_impl_name_ = nullptr; delete [] this->full_direct_proxy_impl_name_; - this->full_direct_proxy_impl_name_ = 0; + this->full_direct_proxy_impl_name_ = nullptr; delete [] this->client_scope_; - this->client_scope_ = 0; + this->client_scope_ = nullptr; delete [] this->flat_client_scope_; - this->flat_client_scope_ = 0; + this->flat_client_scope_ = nullptr; delete [] this->server_scope_; - this->server_scope_ = 0; + this->server_scope_ = nullptr; delete [] this->flat_server_scope_; - this->flat_server_scope_ = 0; + this->flat_server_scope_ = nullptr; this->be_scope::destroy (); this->be_type::destroy (); diff --git a/TAO/TAO_IDL/be/be_identifier_helper.cpp b/TAO/TAO_IDL/be/be_identifier_helper.cpp index 63218c2f7b8..72c848882b1 100644 --- a/TAO/TAO_IDL/be/be_identifier_helper.cpp +++ b/TAO/TAO_IDL/be/be_identifier_helper.cpp @@ -12,7 +12,7 @@ ACE_CString IdentifierHelper::tmp_retval_; const char * IdentifierHelper::type_name (be_type *t, be_visitor *visitor) { - AST_PredefinedType *pdt = 0; + AST_PredefinedType *pdt = nullptr; switch (t->node_type ()) { @@ -78,7 +78,7 @@ IdentifierHelper::type_name (be_type *t, be_visitor *visitor) Identifier * IdentifierHelper::original_local_name (Identifier * local_name) { - Identifier * id = 0; + Identifier * id = nullptr; const char *lname = local_name->get_string (); // Remove _cxx_ if: @@ -95,16 +95,16 @@ IdentifierHelper::original_local_name (Identifier * local_name) const TAO_IDL_CPP_Keyword_Entry *entry = cpp_key_tbl.lookup (lname + 5, len); - if (entry != 0) + if (entry != nullptr) { // Remove _cxx_ and assign to the Identifier variable. ACE_NEW_RETURN (id, Identifier (lname + 5), - 0); + nullptr); } } - if (id == 0) + if (id == nullptr) { id = local_name->copy (); } @@ -118,7 +118,7 @@ IdentifierHelper::orig_sn (UTL_IdList * sn, bool for_idl) ACE_CString retval; bool first = true; bool second = false; - Identifier *id = 0; + Identifier *id = nullptr; for (UTL_IdListActiveIterator i (sn); !i.is_done ();) { @@ -159,7 +159,7 @@ IdentifierHelper::orig_sn (UTL_IdList * sn, bool for_idl) id->destroy (); delete id; - id = 0; + id = nullptr; } return retval; diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 59caee482bd..1d9a9153f53 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -82,23 +82,23 @@ be_interface::be_interface (UTL_ScopedName *n, n), be_type (AST_Decl::NT_interface, n), - direct_proxy_impl_name_ (0), - full_direct_proxy_impl_name_ (0), - client_scope_ (0), - flat_client_scope_ (0), - server_scope_ (0), - flat_server_scope_ (0), + direct_proxy_impl_name_ (nullptr), + full_direct_proxy_impl_name_ (nullptr), + client_scope_ (nullptr), + flat_client_scope_ (nullptr), + server_scope_ (nullptr), + flat_server_scope_ (nullptr), var_out_seq_decls_gen_ (false), skel_count_ (0), in_mult_inheritance_ (-1), - original_interface_ (0), + original_interface_ (nullptr), is_amh_rh_ (false), is_ami_rh_ (false), is_ami4ccm_rh_ (false), - full_skel_name_ (0), - full_coll_name_ (0), - local_coll_name_ (0), - relative_skel_name_ (0), + full_skel_name_ (nullptr), + full_coll_name_ (nullptr), + local_coll_name_ (nullptr), + relative_skel_name_ (nullptr), cached_type_ (-1), has_rw_attributes_ (false), dds_connector_traits_done_ (false) @@ -156,7 +156,7 @@ be_interface::local_name (void) const char * be_interface::full_skel_name (void) { - if (this->full_skel_name_ == 0) + if (this->full_skel_name_ == nullptr) { this->compute_full_skel_name ("POA_", this->full_skel_name_); @@ -169,8 +169,8 @@ const char * be_interface::full_coll_name (int type) { this->compute_coll_names (type, - 0, // prefix - 0); // suffix + nullptr, // prefix + nullptr); // suffix return this->full_coll_name_; } @@ -179,8 +179,8 @@ const char * be_interface::local_coll_name (int type) { this->compute_coll_names (type, - 0, // prefix - 0); // suffix + nullptr, // prefix + nullptr); // suffix return this->local_coll_name_; } @@ -196,7 +196,7 @@ void be_interface::compute_full_skel_name (const char *prefix, char *&skel_name) { - if (skel_name != 0) + if (skel_name != nullptr) { return; } @@ -204,7 +204,7 @@ be_interface::compute_full_skel_name (const char *prefix, size_t namelen = ACE_OS::strlen (prefix); long first = true; long second = false; - char *item_name = 0; + char *item_name = nullptr; // In the first loop compute the total length. for (UTL_IdListActiveIterator i (this->name ()); @@ -284,7 +284,7 @@ be_interface::compute_coll_names (int type, const char *prefix, const char *suffix) { - if (type == this->cached_type_ && this->full_coll_name_ != 0) + if (type == this->cached_type_ && this->full_coll_name_ != nullptr) { return; } @@ -296,8 +296,8 @@ be_interface::compute_coll_names (int type, // Reset to zero in case allocations below fail, and cause // premature return to caller. - this->full_coll_name_ = 0; - this->local_coll_name_ = 0; + this->full_coll_name_ = nullptr; + this->local_coll_name_ = nullptr; } static const char *collocated_names[] = {"_tao_thru_poa_collocated_", @@ -494,8 +494,8 @@ be_interface::relative_name (const char *localname, if (!ACE_OS::strcmp (def_curr, use_curr)) { // They have same prefix, append to arg1. - def_curr = (def_next ? (def_next+2) : 0); // Skip the :: - use_curr = (use_next ? (use_next+2) : 0); // Skip the :: + def_curr = (def_next ? (def_next+2) : nullptr); // Skip the :: + use_curr = (use_next ? (use_next+2) : nullptr); // Skip the :: } else { @@ -541,7 +541,7 @@ be_interface::in_mult_inheritance (void) // Determine if we are in some form of a multiple inheritance. if (this->traverse_inheritance_graph ( be_interface::in_mult_inheritance_helper, - 0 + nullptr ) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -581,7 +581,7 @@ be_interface::redefine (AST_Interface *from) ACE_Unbounded_Queue<AST_Interface *> &q = idl_global->mixed_parentage_interfaces (); size_t slot = 0; - AST_Interface **t = 0; + AST_Interface **t = nullptr; // The queue of interfaces with mixed parentage must // replace each interface that has been forward @@ -758,7 +758,7 @@ be_interface::gen_var_out_seq_decls (void) // execution of the IDL compiler) there is nothing // to tell the IDL compiler that this interface is in any // way special. All we can do is search for the prefix. - ACE_CString test (lname, 0, false); + ACE_CString test (lname, nullptr, false); bool has_ami4ccm_prefix = (test.find ("AMI4CCM_") == 0); bool already_ami = @@ -890,7 +890,7 @@ Pure_Virtual_Regenerator::emit (be_interface *derived_interface, return 0; } - be_decl *d = 0; + be_decl *d = nullptr; for (UTL_ScopeActiveIterator si (base_interface, UTL_Scope::IK_decls); !si.is_done (); @@ -1107,7 +1107,7 @@ be_interface::gen_operation_table (const char *flat_name, // We must randomize this a bit in order to avoid problems with // processing more than one idl file (in separate processes) with // the same name (in different directories). - char *temp_file = 0; + char *temp_file = nullptr; ACE_NEW_RETURN (temp_file, char [ACE_OS::strlen (idl_global->temp_dir ()) + 11 // The number of possible digits in @@ -1148,10 +1148,10 @@ be_interface::gen_operation_table (const char *flat_name, // Make a new outstream to hold the gperf_temp_file for this // interface. - TAO_OutStream *os = 0; + TAO_OutStream *os = nullptr; ACE_NEW_NORETURN (os, TAO_OutStream); - if (os == 0) + if (os == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "be_visitor_interface_ss" @@ -1337,7 +1337,7 @@ be_interface::convert_parent_ops (be_visitor *visitor) // Traverse the graph. Pure_Virtual_Regenerator worker (visitor); - if (this->traverse_inheritance_graph (worker, 0) == -1) + if (this->traverse_inheritance_graph (worker, nullptr) == -1) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_interface::" @@ -1419,7 +1419,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface, AST_Attribute *attr = dynamic_cast<AST_Attribute*> (d); - if (attr == 0) + if (attr == nullptr) return -1; // Generate only the "get" entry if we are @@ -1572,7 +1572,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface, AST_Attribute *attr = dynamic_cast<AST_Attribute*> (d); - if (attr == 0) + if (attr == nullptr) { return -1; } @@ -1767,7 +1767,7 @@ be_interface::traverse_inheritance_graph ( bool abstract_paths_only, bool add_ccm_object) { - AST_Type *intf = 0; // element inside the queue + AST_Type *intf = nullptr; // element inside the queue if (!this->insert_queue.is_empty ()) { @@ -2019,7 +2019,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) } // And reset file to 0 because otherwise there is a problem during destruction of stream. - tao_cg->gperf_input_stream ()->file () = 0; + tao_cg->gperf_input_stream ()->file () = nullptr; // Open the temp file. #if defined (ACE_OPENVMS) @@ -2340,7 +2340,7 @@ be_interface::copy_ctor_helper (be_interface *derived, } else if (base->is_nested ()) { - be_decl *scope = 0; + be_decl *scope = nullptr; scope = dynamic_cast<be_scope*> (base->defined_in ())->decl (); *os << "POA_" << scope->name () << "::" @@ -2428,7 +2428,7 @@ be_interface::op_attr_decl_helper (be_interface * /*derived */, be_interface *ancestor, TAO_OutStream *os) { - if (dynamic_cast<be_component*> (ancestor) != 0) + if (dynamic_cast<be_component*> (ancestor) != nullptr) { return 0; } @@ -2493,34 +2493,34 @@ void be_interface::destroy (void) { delete [] this->full_skel_name_; - this->full_skel_name_ = 0; + this->full_skel_name_ = nullptr; delete [] this->full_coll_name_; - this->full_coll_name_ = 0; + this->full_coll_name_ = nullptr; delete [] this->local_coll_name_; - this->local_coll_name_ = 0; + this->local_coll_name_ = nullptr; delete [] this->relative_skel_name_; - this->relative_skel_name_ = 0; + this->relative_skel_name_ = nullptr; delete [] this->direct_proxy_impl_name_; - this->direct_proxy_impl_name_ = 0; + this->direct_proxy_impl_name_ = nullptr; delete [] this->full_direct_proxy_impl_name_; - this->full_direct_proxy_impl_name_ = 0; + this->full_direct_proxy_impl_name_ = nullptr; delete [] this->client_scope_; - this->client_scope_ = 0; + this->client_scope_ = nullptr; delete [] this->flat_client_scope_; - this->flat_client_scope_ = 0; + this->flat_client_scope_ = nullptr; delete [] this->server_scope_; - this->server_scope_ = 0; + this->server_scope_ = nullptr; delete [] this->flat_server_scope_; - this->flat_server_scope_ = 0; + this->flat_server_scope_ = nullptr; // Call the destroy methods of our base classes. this->AST_Interface::destroy (); @@ -2586,7 +2586,7 @@ be_interface::enqueue_base_component_r (AST_Component *node) { AST_Component *base = node->base_component (); - if (base == 0) + if (base == nullptr) { return; } @@ -2609,7 +2609,7 @@ be_interface::enqueue_base_home_r (AST_Home *node) { AST_Home *base = node->base_home (); - if (base == 0) + if (base == nullptr) { return; } @@ -2706,7 +2706,7 @@ void be_interface::gen_skel_inheritance (TAO_OutStream *os) { long n_parents = this->n_inherits (); - AST_Type *parent = 0; + AST_Type *parent = nullptr; AST_Type **parents = this->inherits (); bool has_concrete_parent = false; @@ -2905,7 +2905,7 @@ be_interface::is_ami4ccm_rh (bool val) const char * be_interface::direct_proxy_impl_name (void) { - if (this->direct_proxy_impl_name_ == 0) + if (this->direct_proxy_impl_name_ == nullptr) { this->direct_proxy_impl_name_ = this->create_with_prefix_suffix ( @@ -2921,7 +2921,7 @@ be_interface::direct_proxy_impl_name (void) const char * be_interface::full_direct_proxy_impl_name (void) { - if (this->full_direct_proxy_impl_name_ == 0) + if (this->full_direct_proxy_impl_name_ == nullptr) { const char *scope = this->server_enclosing_scope (); const char *base_name = this->direct_proxy_impl_name (); @@ -2931,7 +2931,7 @@ be_interface::full_direct_proxy_impl_name (void) ACE_NEW_RETURN (this->full_direct_proxy_impl_name_, char[length + 1], - 0); + nullptr); ACE_OS::strcpy (this->full_direct_proxy_impl_name_, scope); @@ -2946,7 +2946,7 @@ be_interface::full_direct_proxy_impl_name (void) const char * be_interface::client_enclosing_scope (void) { - if (this->client_scope_ == 0) + if (this->client_scope_ == nullptr) { const char *full_name = this->full_name (); const char *name = this->local_name (); @@ -2955,7 +2955,7 @@ be_interface::client_enclosing_scope (void) size_t length = ACE_OS::strlen (full_name) - offset; ACE_NEW_RETURN (this->client_scope_, char[length + 1], - 0); + nullptr); ACE_OS::strncpy (this->client_scope_, full_name, length); this->client_scope_[length] = '\0'; @@ -2967,7 +2967,7 @@ be_interface::client_enclosing_scope (void) const char * be_interface::flat_client_enclosing_scope (void) { - if (this->flat_client_scope_ == 0) + if (this->flat_client_scope_ == nullptr) { const char *full_name = this->flat_name (); const char *name = @@ -2978,7 +2978,7 @@ be_interface::flat_client_enclosing_scope (void) ACE_NEW_RETURN (this->flat_client_scope_, char[length + 1], - 0); + nullptr); ACE_OS::strncpy (this->flat_client_scope_, full_name, @@ -2992,7 +2992,7 @@ be_interface::flat_client_enclosing_scope (void) const char * be_interface::server_enclosing_scope (void) { - if (this->server_scope_ == 0) + if (this->server_scope_ == nullptr) { const char *full_name = this->full_coll_name (be_interface::DIRECT); @@ -3004,7 +3004,7 @@ be_interface::server_enclosing_scope (void) size_t length = ACE_OS::strlen (full_name) - offset; ACE_NEW_RETURN (this->server_scope_, char[length + 1], - 0); + nullptr); ACE_OS::strncpy (this->server_scope_, full_name, length); this->server_scope_[length] = '\0'; @@ -3019,7 +3019,7 @@ be_interface::create_with_prefix_suffix (const char *prefix, const char *suffix, const char *separator) { - char *cat_string = 0; + char *cat_string = nullptr; size_t length = ACE_OS::strlen (str) + ACE_OS::strlen (prefix) + @@ -3029,7 +3029,7 @@ be_interface::create_with_prefix_suffix (const char *prefix, ACE_NEW_RETURN (cat_string, char[length], - 0); + nullptr); ACE_OS::strcpy (cat_string, prefix); ACE_OS::strcat (cat_string, str); diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp index e181ad58fa0..f7bda2708c0 100644 --- a/TAO/TAO_IDL/be/be_operation.cpp +++ b/TAO/TAO_IDL/be/be_operation.cpp @@ -87,14 +87,14 @@ be_operation::be_add_argument (AST_Argument *arg) this->add_to_scope (arg); this->add_to_referenced (arg, 0, - 0); + nullptr); return arg; } int be_operation::be_insert_exception (AST_Exception *ex) { - UTL_ExceptList *new_list = 0; + UTL_ExceptList *new_list = nullptr; ACE_NEW_RETURN (new_list, UTL_ExceptList (ex, this->pd_exceptions), diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp index b141bd47187..b6943001da8 100644 --- a/TAO/TAO_IDL/be/be_predefined_type.cpp +++ b/TAO/TAO_IDL/be/be_predefined_type.cpp @@ -126,16 +126,16 @@ void be_predefined_type::compute_tc_name (void) { // Start with the head as the CORBA namespace. - Identifier *corba_id = 0; + Identifier *corba_id = nullptr; ACE_NEW (corba_id, Identifier ("CORBA")); ACE_NEW (this->tc_name_, UTL_ScopedName (corba_id, - 0)); + nullptr)); - Identifier *id = 0; - UTL_ScopedName *conc_name = 0; + Identifier *id = nullptr; + UTL_ScopedName *conc_name = nullptr; switch (this->pt ()) { @@ -229,7 +229,7 @@ be_predefined_type::compute_tc_name (void) ACE_NEW (conc_name, UTL_ScopedName (id, - 0)); + nullptr)); this->tc_name_->nconc (conc_name); } diff --git a/TAO/TAO_IDL/be/be_scope.cpp b/TAO/TAO_IDL/be/be_scope.cpp index 888e48cf825..34bb4b93cc8 100644 --- a/TAO/TAO_IDL/be/be_scope.cpp +++ b/TAO/TAO_IDL/be/be_scope.cpp @@ -43,7 +43,7 @@ be_scope::be_add_field (AST_Field *f) AST_Argument * be_scope::be_add_argument (AST_Argument *) { - return 0; + return nullptr; } void @@ -95,7 +95,7 @@ be_scope::decl (void) case AST_Decl::NT_finder: return dynamic_cast<be_finder*> (this); default: - return (be_decl *)0; + return (be_decl *)nullptr; } } diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp index e0a16eb6a9a..525c4e6d03f 100644 --- a/TAO/TAO_IDL/be/be_sequence.cpp +++ b/TAO/TAO_IDL/be/be_sequence.cpp @@ -55,7 +55,7 @@ be_sequence::be_sequence (AST_Expression *v, be_type (AST_Decl::NT_sequence, n), mt_ (be_sequence::MNG_UNKNOWN), - field_node_ (0) + field_node_ (nullptr) { // Always the case. this->has_constructor (true); @@ -96,8 +96,8 @@ be_sequence::be_sequence (AST_Expression *v, } AST_Decl::NodeType nt = t->node_type (); - AST_Typedef *td = 0; - AST_Type *pbt = 0; + AST_Typedef *td = nullptr; + AST_Type *pbt = nullptr; if (nt == AST_Decl::NT_typedef) { @@ -135,7 +135,7 @@ char * be_sequence::gen_name (void) { char namebuf [NAMEBUFSIZE]; - be_type *bt = 0; + be_type *bt = nullptr; // Reset the buffer. ACE_OS::memset (namebuf, @@ -145,7 +145,7 @@ be_sequence::gen_name (void) // Retrieve the base type. bt = dynamic_cast<be_type*> (this->base_type ()); - if (bt == 0) + if (bt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_sequence::" @@ -163,7 +163,7 @@ be_sequence::gen_name (void) // Our base type is an anonymous sequence. be_sequence *seq = dynamic_cast<be_sequence*> (bt); - if (seq == 0) + if (seq == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_sequence::" @@ -215,11 +215,11 @@ be_sequence::gen_name (void) int be_sequence::create_name (be_typedef *node) { - static char *namebuf = 0; - UTL_ScopedName *n = 0; + static char *namebuf = nullptr; + UTL_ScopedName *n = nullptr; // Scope in which we are defined. - be_decl *scope = 0; + be_decl *scope = nullptr; // If there is a typedef node, we use its name as our name. if (node) @@ -238,20 +238,20 @@ be_sequence::create_name (be_typedef *node) scope = dynamic_cast<be_scope*> (us)->decl (); - if (scope != 0) + if (scope != nullptr) { // Make a copy of the enclosing scope's name. n = (UTL_ScopedName *) scope->name ()->copy (); - Identifier *id = 0; + Identifier *id = nullptr; ACE_NEW_RETURN (id, Identifier (namebuf), -1); - UTL_ScopedName *conc_name = 0; + UTL_ScopedName *conc_name = nullptr; ACE_NEW_RETURN (conc_name, UTL_ScopedName (id, - 0), + nullptr), -1); // Add our local name as the last component. @@ -280,8 +280,8 @@ be_sequence::managed_type (void) if (this->mt_ == be_sequence::MNG_UNKNOWN) // Not calculated yet. { // Base types. - be_type *bt = 0; - be_type *prim_type = 0; + be_type *bt = nullptr; + be_type *prim_type = nullptr; bt = dynamic_cast<be_type*> (this->base_type ()); @@ -361,9 +361,9 @@ be_sequence::managed_type (void) AST_Sequence * be_sequence::fe_add_sequence (AST_Sequence *t) { - if (t == 0) + if (t == nullptr) { - return 0; + return nullptr; } this->add_to_local_types (t); @@ -426,10 +426,10 @@ be_sequence::instance_name () '\0', NAMEBUFSIZE); - be_type *bt = 0; + be_type *bt = nullptr; bt = dynamic_cast<be_type*> (this->base_type ()); - if (bt == 0) + if (bt == nullptr) { ACE_ERROR ((LM_ERROR, "(%N:%l) be_visitor_sequence_ch::" @@ -525,7 +525,7 @@ be_sequence::instance_name () be_predefined_type *predef = dynamic_cast<be_predefined_type*> (prim_type); - if (predef != 0 + if (predef != nullptr && predef->pt() == AST_PredefinedType::PT_octet) { ACE_OS::sprintf (namebuf, @@ -621,7 +621,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os, break; case be_sequence::MNG_STRING: { - be_type *prim_type = 0; + be_type *prim_type = nullptr; if (elem->node_type () == AST_Decl::NT_typedef) { // Get the primitive base type of this typedef node. @@ -680,7 +680,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os, break; case be_sequence::MNG_WSTRING: { - be_type *prim_type = 0; + be_type *prim_type = nullptr; if (elem->node_type () == AST_Decl::NT_typedef) { // Get the primitive base type of this typedef node. @@ -813,13 +813,13 @@ be_sequence::compute_tc_name (void) // TypeCode. Generate a TypeCode name that is meant for internal // use alone. - Identifier * tao_id = 0; + Identifier * tao_id = nullptr; ACE_NEW (tao_id, Identifier ("TAO")); ACE_NEW (this->tc_name_, UTL_ScopedName (tao_id, - 0)); + nullptr)); char bound[30] = { 0 }; @@ -832,25 +832,25 @@ be_sequence::compute_tc_name (void) + ACE_CString (this->flat_name ()) + ACE_CString (bound); - Identifier * typecode_scope = 0; + Identifier * typecode_scope = nullptr; ACE_NEW (typecode_scope, Identifier ("TypeCode")); - UTL_ScopedName * tc_scope_conc_name = 0; + UTL_ScopedName * tc_scope_conc_name = nullptr; ACE_NEW (tc_scope_conc_name, UTL_ScopedName (typecode_scope, - 0)); + nullptr)); this->tc_name_->nconc (tc_scope_conc_name); - Identifier * id = 0; + Identifier * id = nullptr; ACE_NEW (id, Identifier (local_tc_name.c_str ())); - UTL_ScopedName * conc_name = 0; + UTL_ScopedName * conc_name = nullptr; ACE_NEW (conc_name, UTL_ScopedName (id, - 0)); + nullptr)); this->tc_name_->nconc (conc_name); } diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp index cad20654cb6..561a6b17990 100644 --- a/TAO/TAO_IDL/be/be_string.cpp +++ b/TAO/TAO_IDL/be/be_string.cpp @@ -97,7 +97,7 @@ be_string::gen_member_ostream_operator (TAO_OutStream *os, void be_string::compute_tc_name (void) { - Identifier * id = 0; + Identifier * id = nullptr; ACE_CDR::ULong val = 0UL; AST_Expression zero (val); @@ -107,13 +107,13 @@ be_string::compute_tc_name (void) // constants. // Start with the head as the CORBA namespace. - Identifier * corba_id = 0; + Identifier * corba_id = nullptr; ACE_NEW (corba_id, Identifier ("CORBA")); ACE_NEW (this->tc_name_, UTL_ScopedName (corba_id, - 0)); + nullptr)); ACE_NEW (id, Identifier (this->width () == 1 @@ -125,26 +125,26 @@ be_string::compute_tc_name (void) // We have a bounded string. Generate a TypeCode name that is // meant for internal use alone. - Identifier * tao_id = 0; + Identifier * tao_id = nullptr; ACE_NEW (tao_id, Identifier ("TAO")); ACE_NEW (this->tc_name_, UTL_ScopedName (tao_id, - 0)); + nullptr)); ACE_CString local_tc_name = ACE_CString ("tc_") + ACE_CString (this->flat_name ()); - Identifier * typecode_scope = 0; + Identifier * typecode_scope = nullptr; ACE_NEW (typecode_scope, Identifier ("TypeCode")); - UTL_ScopedName * tc_scope_conc_name = 0; + UTL_ScopedName * tc_scope_conc_name = nullptr; ACE_NEW (tc_scope_conc_name, UTL_ScopedName (typecode_scope, - 0)); + nullptr)); this->tc_name_->nconc (tc_scope_conc_name); @@ -154,10 +154,10 @@ be_string::compute_tc_name (void) zero.destroy (); - UTL_ScopedName *conc_name = 0; + UTL_ScopedName *conc_name = nullptr; ACE_NEW (conc_name, UTL_ScopedName (id, - 0)); + nullptr)); this->tc_name_->nconc (conc_name); } diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp index 2b9009a2388..414bac439fd 100644 --- a/TAO/TAO_IDL/be/be_structure.cpp +++ b/TAO/TAO_IDL/be/be_structure.cpp @@ -114,7 +114,7 @@ be_structure::gen_ostream_operator (TAO_OutStream *os, be_field *f = dynamic_cast<be_field*> (this->pd_decls[i]); // We don't want any decls, just members. - if (f == 0) + if (f == nullptr) { continue; } diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp index b3af3ac3626..6b5d0ed1749 100644 --- a/TAO/TAO_IDL/be/be_type.cpp +++ b/TAO/TAO_IDL/be/be_type.cpp @@ -35,12 +35,12 @@ be_type::be_type (AST_Decl::NodeType nt, n), be_decl (nt, n), - tc_name_ (0), + tc_name_ (nullptr), common_varout_gen_ (false), seen_in_sequence_ (false), seen_in_operation_ (false) { - if (n != 0) + if (n != nullptr) { this->gen_fwd_helper_name (); } @@ -61,32 +61,32 @@ be_type::compute_tc_name (void) static char namebuf [NAMEBUFSIZE]; UTL_ScopedName *n = this->name (); - if (this->tc_name_ != 0) + if (this->tc_name_ != nullptr) { this->tc_name_->destroy (); delete this->tc_name_; - this->tc_name_ = 0; + this->tc_name_ = nullptr; } ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE); - while (n->tail () != 0) + while (n->tail () != nullptr) { // Does not exist. - if (this->tc_name_ == 0) + if (this->tc_name_ == nullptr) { ACE_NEW (this->tc_name_, UTL_ScopedName (n->head ()->copy (), - 0)); + nullptr)); } else { - UTL_ScopedName *conc_name = 0; + UTL_ScopedName *conc_name = nullptr; ACE_NEW (conc_name, UTL_ScopedName (n->head ()->copy (), - 0)); + nullptr)); this->tc_name_->nconc (conc_name); } @@ -98,23 +98,23 @@ be_type::compute_tc_name (void) "_tc_%s", n->last_component ()->get_string ()); - Identifier *id = 0; + Identifier *id = nullptr; ACE_NEW (id, Identifier (namebuf)); // Does not exist. - if (this->tc_name_ == 0) + if (this->tc_name_ == nullptr) { ACE_NEW (this->tc_name_, UTL_ScopedName (id, - 0)); + nullptr)); } else { - UTL_ScopedName *conc_name = 0; + UTL_ScopedName *conc_name = nullptr; ACE_NEW (conc_name, UTL_ScopedName (id, - 0)); + nullptr)); this->tc_name_->nconc (conc_name); } @@ -125,7 +125,7 @@ UTL_ScopedName * be_type::tc_name (void) { // Compute and init the member. - if (this->tc_name_ == 0) + if (this->tc_name_ == nullptr) { this->compute_tc_name (); } @@ -145,7 +145,7 @@ be_type::nested_sp_type_name (be_decl *use_scope, const char *prefix) { // Our defining scope. - be_decl *fu_scope = 0; + be_decl *fu_scope = nullptr; char fu_name [NAMEBUFSIZE]; char fl_name [NAMEBUFSIZE]; @@ -160,10 +160,10 @@ be_type::nested_sp_type_name (be_decl *use_scope, fu_scope = this->defined_in () ? dynamic_cast<be_scope*> (this->defined_in ())->decl () - : 0; + : nullptr; ACE_OS::strcat (fu_name, - (fu_scope != 0 ? fu_scope->full_name () : "")); + (fu_scope != nullptr ? fu_scope->full_name () : "")); ACE_OS::strcat (fu_name, "::TAO_"); @@ -188,11 +188,11 @@ void be_type::gen_fwd_helper_name (void) { AST_Decl *parent = ScopeAsDecl (this->defined_in ()); - Identifier *segment = 0; - char *tmp = 0; + Identifier *segment = nullptr; + char *tmp = nullptr; this->fwd_helper_name_.clear (true); - if (parent != 0 && parent->node_type () != AST_Decl::NT_root) + if (parent != nullptr && parent->node_type () != AST_Decl::NT_root) { for (UTL_IdListActiveIterator i (parent->name ()); !i.is_done (); @@ -306,16 +306,16 @@ be_type::gen_stub_decls (TAO_OutStream *os) AST_Interface *i = dynamic_cast<AST_Interface*> (this); AST_ValueType *v = dynamic_cast<AST_ValueType*> (this); - if (i != 0) + if (i != nullptr) { *os << "typedef " << this->local_name () - << (v == 0 ? "_ptr" : " *") << " _ptr_type;"; + << (v == nullptr ? "_ptr" : " *") << " _ptr_type;"; } bool skip_varout = false; AST_Sequence *s = dynamic_cast<AST_Sequence*> (this); - if (s != 0) + if (s != nullptr) { // _vars and _outs not supported yet by alt mapping. if (be_global->alt_mapping () && s->unbounded ()) @@ -379,11 +379,11 @@ be_type::base_node_type (void) const void be_type::destroy (void) { - if (this->tc_name_ != 0) + if (this->tc_name_ != nullptr) { this->tc_name_->destroy (); delete this->tc_name_; - this->tc_name_ = 0; + this->tc_name_ = nullptr; } this->be_decl::destroy (); diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp index c49917167f2..a1aa30cbc58 100644 --- a/TAO/TAO_IDL/be/be_typedef.cpp +++ b/TAO/TAO_IDL/be/be_typedef.cpp @@ -73,7 +73,7 @@ be_type * be_typedef::primitive_base_type (void) { be_type *d = this; - be_typedef *temp = 0; + be_typedef *temp = nullptr; while (d && d->node_type () == AST_Decl::NT_typedef) { diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp index 30d69ca70e2..371152a2cb0 100644 --- a/TAO/TAO_IDL/be/be_union.cpp +++ b/TAO/TAO_IDL/be/be_union.cpp @@ -111,7 +111,7 @@ be_union::gen_ostream_operator (TAO_OutStream *os, dynamic_cast<be_union_branch*> (this->pd_decls[i]); // We don't want any decls, just members. - if (ub == 0) + if (ub == nullptr) { continue; } @@ -207,7 +207,7 @@ be_union::gen_empty_default_label (void) } AST_ConcreteType *disc = this->disc_type (); - if (disc == 0) + if (disc == nullptr) { return true; // In reality this is an error. } @@ -224,7 +224,7 @@ be_union::gen_empty_default_label (void) } AST_PredefinedType *pdt = dynamic_cast<AST_PredefinedType*> (disc); - if (pdt == 0) + if (pdt == nullptr) { return true; // In reality this is an error. } @@ -278,7 +278,7 @@ be_union::nlabels (void) AST_UnionBranch *ub = dynamic_cast<AST_UnionBranch*> (d); - if (ub != 0) + if (ub != nullptr) { retval += ub->label_list_length (); } diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp index 70d4bb34e7b..41312179c73 100644 --- a/TAO/TAO_IDL/be/be_union_branch.cpp +++ b/TAO/TAO_IDL/be/be_union_branch.cpp @@ -56,7 +56,7 @@ be_union_branch::gen_label_value (TAO_OutStream *os, unsigned long index) be_union *u = dynamic_cast<be_union*> (this->defined_in ()); - if (u == 0) + if (u == nullptr) { return -1; } @@ -64,7 +64,7 @@ be_union_branch::gen_label_value (TAO_OutStream *os, unsigned long index) be_type* dt = dynamic_cast<be_type*> (u->disc_type ()); - if (dt == 0) + if (dt == nullptr) { return -1; } @@ -85,7 +85,7 @@ be_union_branch::gen_label_value (TAO_OutStream *os, unsigned long index) be_scope* scope = dynamic_cast<be_scope*> (dt->defined_in ()); - if (scope == 0) + if (scope == nullptr) { *os << e->n (); return 0; diff --git a/TAO/TAO_IDL/be/be_uses.cpp b/TAO/TAO_IDL/be/be_uses.cpp index 739e7865011..1c7e8b67254 100644 --- a/TAO/TAO_IDL/be/be_uses.cpp +++ b/TAO/TAO_IDL/be/be_uses.cpp @@ -19,7 +19,7 @@ be_uses::be_uses (UTL_ScopedName *n, n), be_field (uses_type, n), - original_uses_ (0) + original_uses_ (nullptr) { } diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp index 5b7d379ad4a..8a0c0fada54 100644 --- a/TAO/TAO_IDL/be/be_util.cpp +++ b/TAO/TAO_IDL/be/be_util.cpp @@ -34,7 +34,7 @@ be_util::gen_nested_namespace_begin (TAO_OutStream *os, be_module *node, bool skel) { - char *item_name = 0; + char *item_name = nullptr; bool first_level = true; for (UTL_IdListActiveIterator i (node->name ()); @@ -154,11 +154,11 @@ be_util::prep_be_arg (char *s) static const char stripped_filename[] = "stripped_filename="; static const char no_fixed_err[] = "no_fixed_err"; - char* last = 0; + char* last = nullptr; for (char* arg = ACE_OS::strtok_r (s, ",", &last); - arg != 0; - arg = ACE_OS::strtok_r (0, ",", &last)) + arg != nullptr; + arg = ACE_OS::strtok_r (nullptr, ",", &last)) { if (ACE_OS::strstr (arg, arg_macro) == arg) { @@ -944,10 +944,10 @@ be_util::generator_init (void) { tao_cg = TAO_CODEGEN::instance (); - AST_Generator *gen = 0; + AST_Generator *gen = nullptr; ACE_NEW_RETURN (gen, be_generator, - 0); + nullptr); return gen; } @@ -957,15 +957,15 @@ be_util::get_output_path (bool for_anyop, bool for_skel, bool for_exec) { - if (for_anyop && 0 != be_global->anyop_output_dir ()) + if (for_anyop && nullptr != be_global->anyop_output_dir ()) { return be_global->anyop_output_dir (); } - else if (for_skel && 0 != be_global->skel_output_dir ()) + else if (for_skel && nullptr != be_global->skel_output_dir ()) { return be_global->skel_output_dir (); } - else if (for_exec && 0 != be_global->exec_output_dir ()) + else if (for_exec && nullptr != be_global->exec_output_dir ()) { return be_global->exec_output_dir (); } @@ -1008,7 +1008,7 @@ be_util::overwrite_ciao_exec_files () void be_util::set_arg_seen_bit (be_type *bt) { - if (bt == 0) + if (bt == nullptr) { return; } diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index c33d72cf256..13191558703 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -77,7 +77,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n, custom), supports_abstract_ (false), var_out_seq_decls_gen_ (false), - full_obv_skel_name_ (0), + full_obv_skel_name_ (nullptr), is_amh_excep_holder_ (false) { // Check that redefine() copies all members. @@ -87,7 +87,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n, AST_Module *m = dynamic_cast<AST_Module*> (this->defined_in ()); - if (m != 0) + if (m != nullptr) { m->set_has_nested_valuetype (); } @@ -100,7 +100,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n, be_interface *intf = dynamic_cast<be_interface*> (this->pd_supports[i]); - if (intf == 0) + if (intf == nullptr) { // The item is a template param holder. continue; @@ -142,7 +142,7 @@ be_valuetype::redefine (AST_Interface *from) // This should always be TRUE, but our signature is inherited, so // the narrow is necessary and should always be checked. - if (bv != 0) + if (bv != nullptr) { this->var_out_seq_decls_gen_ = bv->var_out_seq_decls_gen_; } @@ -170,7 +170,7 @@ be_valuetype::compute_fullobvskelname (void) const char* be_valuetype::full_obv_skel_name (void) { - if (0 == this->full_obv_skel_name_) + if (nullptr == this->full_obv_skel_name_) { this->compute_fullobvskelname (); } @@ -303,7 +303,7 @@ be_valuetype::have_operation (void) { be_valuetype *vt = dynamic_cast<be_valuetype*> (inherits[i]); - if (vt != 0 && vt->have_operation ()) + if (vt != nullptr && vt->have_operation ()) { have_operation = true; break; @@ -316,12 +316,12 @@ be_valuetype::have_operation (void) // Check for operations on supported interfaces AST_Type * supported = this->supports_concrete (); - if (supported != 0) + if (supported != nullptr) { be_interface *intf = dynamic_cast<be_interface*> (supported); - if (intf != 0) + if (intf != nullptr) { have_operation = be_valuetype::have_supported_op (intf); @@ -349,7 +349,7 @@ be_valuetype::have_supported_op (be_interface * node) { AST_Decl *d = si.item (); - if (d == 0) + if (d == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_valuetype::") @@ -380,7 +380,7 @@ be_valuetype::have_supported_op (be_interface * node) be_interface * intf = dynamic_cast<be_interface*> (inherits[i]); - if (intf != 0) + if (intf != nullptr) { have_supported_op = be_valuetype::have_supported_op (intf); @@ -410,7 +410,7 @@ be_valuetype::has_member (void) AST_Type *parent = this->pd_inherits_concrete; // We're looking for inherited members too. - if (parent != 0) + if (parent != nullptr) { be_valuetype *be_parent = dynamic_cast<be_valuetype*> (parent); @@ -603,7 +603,7 @@ be_valuetype::field_pd_postfix (void) be_valuetype * be_valuetype::statefull_inherit (void) { - if (this->pd_inherits_concrete != 0) + if (this->pd_inherits_concrete != nullptr) { return dynamic_cast<be_valuetype*> ( @@ -611,7 +611,7 @@ be_valuetype::statefull_inherit (void) } else { - return 0; + return nullptr; } } @@ -626,7 +626,7 @@ void be_valuetype::destroy (void) { delete [] this->full_obv_skel_name_; - this->full_obv_skel_name_ = 0; + this->full_obv_skel_name_ = nullptr; this->be_interface::destroy (); this->AST_ValueType::destroy (); @@ -654,7 +654,7 @@ be_valuetype::data_members_count (AST_Field::Visibility vis) AST_Field *field = dynamic_cast<AST_Field*> (d); AST_Attribute *attr = dynamic_cast<AST_Attribute*> (d); - if (field == 0 || attr != 0) + if (field == nullptr || attr != nullptr) { continue; } @@ -701,7 +701,7 @@ be_valuetype::traverse_supports_list_graphs ( this->insert_queue.reset (); this->del_queue.reset (); - be_interface *supported_interface = 0; + be_interface *supported_interface = nullptr; for (long i = 0; i < n_supports; ++i) { @@ -744,7 +744,7 @@ be_valuetype::traverse_concrete_inheritance_graph (tao_code_emitter gen, { AST_Type *supported = this->supports_concrete (); - if (supported == 0) + if (supported == nullptr) { return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp index a694dbc036f..564b30a082b 100644 --- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp @@ -68,7 +68,7 @@ int be_visitor_amh_pre_proc::visit_interface (be_interface *node) { // Do not generate AMH classes for any sort of implied IDL. - if (node->original_interface () != 0) + if (node->original_interface () != nullptr) { return 0; } @@ -113,7 +113,7 @@ be_visitor_amh_pre_proc::visit_interface (be_interface *node) be_interface *response_handler = this->create_response_handler (node, excep_holder); - if (response_handler == 0) + if (response_handler == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_amh_pre_proc::" @@ -167,16 +167,16 @@ be_visitor_amh_pre_proc::create_response_handler ( // the inherited classes in the original interface, change their // names and then use the symbol table to look up the // AMH-response-handler nodes. - be_interface *response_handler = 0; + be_interface *response_handler = nullptr; ACE_NEW_RETURN (response_handler, be_interface (amh_name, // name - 0, // list of inherited + nullptr, // list of inherited 0, // number of inherited - 0, // list of ancestors + nullptr, // list of ancestors 0, // number of ancestors 1, // local 0), // non-abstract - 0); + nullptr); idl_global->scopes ().pop (); @@ -190,7 +190,7 @@ be_visitor_amh_pre_proc::create_response_handler ( // and set the prefix to the node's prefix. All this is // necessary in case the node's prefix was modified after // its declaration. - response_handler->AST_Decl::repoID (0); + response_handler->AST_Decl::repoID (nullptr); response_handler->prefix (const_cast<char*> (node->prefix ())); response_handler->gen_fwd_helper_name (); @@ -231,7 +231,7 @@ be_visitor_amh_pre_proc::add_rh_node_members ( be_interface *node, { be_attribute *attr = dynamic_cast<be_attribute*> (d); - if (attr != 0) + if (attr != nullptr) { status = this->create_response_handler_attribute (attr, @@ -252,7 +252,7 @@ be_visitor_amh_pre_proc::add_rh_node_members ( be_interface *node, { be_operation* operation = dynamic_cast<be_operation*> (d); - if (operation != 0) + if (operation != nullptr) { status = this->create_response_handler_operation (operation, @@ -285,7 +285,7 @@ be_visitor_amh_pre_proc::create_response_handler_operation ( be_valuetype *exception_holder ) { - if (node == 0) + if (node == nullptr) { return -1; } @@ -325,7 +325,7 @@ be_visitor_amh_pre_proc::create_response_handler_attribute ( get_operation->destroy (); delete get_operation; - get_operation = 0; + get_operation = nullptr; if (status == -1) { @@ -349,7 +349,7 @@ be_visitor_amh_pre_proc::create_response_handler_attribute ( set_operation->destroy (); delete set_operation; - set_operation = 0; + set_operation = nullptr; return status; } @@ -362,7 +362,7 @@ be_visitor_amh_pre_proc::add_exception_reply (be_operation *node, UTL_ScopedName *operation_name = node->compute_name ("", "_excep"); - be_operation *node_excep = 0; + be_operation *node_excep = nullptr; ACE_NEW_RETURN (node_excep, be_operation (be_global->void_type (), AST_Operation::OP_noflags, @@ -373,17 +373,17 @@ be_visitor_amh_pre_proc::add_exception_reply (be_operation *node, node_excep->set_name (operation_name); - Identifier *arg_id = 0; + Identifier *arg_id = nullptr; ACE_NEW_RETURN (arg_id, Identifier ("holder"), -1); - UTL_ScopedName *arg_name = 0; + UTL_ScopedName *arg_name = nullptr; ACE_NEW_RETURN (arg_name, - UTL_ScopedName (arg_id, 0), + UTL_ScopedName (arg_id, nullptr), -1); - be_argument *argument = 0; + be_argument *argument = nullptr; ACE_NEW_RETURN (argument, be_argument (AST_Argument::dir_IN, exception_holder, @@ -396,7 +396,7 @@ be_visitor_amh_pre_proc::add_exception_reply (be_operation *node, node_excep->set_defined_in (response_handler); - if (0 == response_handler->be_add_operation (node_excep)) + if (nullptr == response_handler->be_add_operation (node_excep)) { return -1; } @@ -408,8 +408,8 @@ int be_visitor_amh_pre_proc::add_normal_reply (be_operation *node, be_interface *response_handler) { - Identifier *id = 0; - UTL_ScopedName *sn = 0; + Identifier *id = nullptr; + UTL_ScopedName *sn = nullptr; ACE_CString original_op_name ( node->name ()->last_component ()->get_string () @@ -424,13 +424,13 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node, ACE_NEW_RETURN (sn, UTL_ScopedName (id, - 0), + nullptr), -1); op_name->nconc (sn); // Create the operation - be_operation *operation = 0; + be_operation *operation = nullptr; ACE_NEW_RETURN (operation, be_operation (be_global->void_type (), AST_Operation::OP_noflags, @@ -445,18 +445,18 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node, if (!node->void_return_type ()) { - Identifier *arg_id = 0; + Identifier *arg_id = nullptr; ACE_NEW_RETURN (arg_id, Identifier ("return_value"), -1); - UTL_ScopedName *arg_name = 0; + UTL_ScopedName *arg_name = nullptr; ACE_NEW_RETURN (arg_name, - UTL_ScopedName (arg_id, 0), + UTL_ScopedName (arg_id, nullptr), -1); // Create the argument - be_argument *arg = 0; + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, node->return_type (), @@ -481,7 +481,7 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node, { operation->destroy (); delete operation; - operation = 0; + operation = nullptr; ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_amh_pre_proc::") @@ -498,7 +498,7 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node, original_arg->direction () == AST_Argument::dir_OUT) { // Create the argument - be_argument *arg = 0; + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, original_arg->field_type (), @@ -516,7 +516,7 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node, // After having generated the operation we insert it into the // response handler interface. - if (0 == response_handler->be_add_operation (operation)) + if (nullptr == response_handler->be_add_operation (operation)) { return -1; } @@ -548,7 +548,7 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node) idl_global->valuefactory_seen_ = true; const int inherit_count = 0; - AST_Type **p_intf = 0; + AST_Type **p_intf = nullptr; UTL_ScopedName *excep_holder_name = node->compute_name ("AMH_", @@ -557,21 +557,21 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node) UTL_Scope *s = node->defined_in (); idl_global->scopes ().push (s); - be_valuetype *excep_holder = 0; + be_valuetype *excep_holder = nullptr; ACE_NEW_RETURN (excep_holder, be_valuetype (excep_holder_name, p_intf, inherit_count, + nullptr, + nullptr, 0, + nullptr, 0, - 0, - 0, - 0, - 0, + nullptr, 0, 0, 0), - 0); + nullptr); idl_global->scopes ().pop (); @@ -582,7 +582,7 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node) // and set the prefix to the node's prefix. All this is // necessary in case the node's prefix was modified after // its declaration. - excep_holder->AST_Decl::repoID (0); + excep_holder->AST_Decl::repoID (nullptr); excep_holder->prefix (const_cast<char*> (node->prefix ())); excep_holder->gen_fwd_helper_name (); @@ -597,7 +597,7 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node) { AST_Decl *d = si.item (); - if (d == 0) + if (d == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_amh_pre_proc::" @@ -613,9 +613,9 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node) { AST_Attribute *attribute = dynamic_cast<AST_Attribute*> (d); - if (attribute == 0) + if (attribute == nullptr) { - return 0; + return nullptr; } this->create_raise_operation (op, @@ -651,9 +651,9 @@ be_visitor_amh_pre_proc::create_raise_operation ( Operation_Kind operation_kind ) { - Identifier *id = 0; - UTL_ScopedName *sn = 0; - be_operation *orig_op = 0; + Identifier *id = nullptr; + UTL_ScopedName *sn = nullptr; + be_operation *orig_op = nullptr; if (operation_kind == NORMAL) { @@ -683,12 +683,12 @@ be_visitor_amh_pre_proc::create_raise_operation ( ACE_NEW_RETURN (sn, UTL_ScopedName (id, - 0), + nullptr), -1); op_name->nconc (sn); - be_operation *operation = 0; + be_operation *operation = nullptr; ACE_NEW_RETURN (operation, be_operation (be_global->void_type (), AST_Operation::OP_noflags, @@ -707,7 +707,7 @@ be_visitor_amh_pre_proc::create_raise_operation ( // Copy the exceptions. UTL_ExceptList *exceptions = orig_op->exceptions (); - if (0 != exceptions) + if (nullptr != exceptions) { operation->be_add_exceptions (exceptions->copy ()); } @@ -716,7 +716,7 @@ be_visitor_amh_pre_proc::create_raise_operation ( // After having generated the operation we insert it into the // exceptionholder valuetype. - if (0 == excep_holder->be_add_operation (operation)) + if (nullptr == excep_holder->be_add_operation (operation)) { return -1; } @@ -751,14 +751,14 @@ be_visitor_amh_pre_proc::generate_get_operation (be_attribute *node) static_cast<UTL_ScopedName *> (node->name ()-> copy ()); get_name->last_component ()->replace_string (new_op_name.c_str ()); - be_operation *operation = 0; + be_operation *operation = nullptr; ACE_NEW_RETURN (operation, be_operation (node->field_type (), AST_Operation::OP_noflags, get_name, 1, 0), - 0); + nullptr); operation->set_name (get_name); operation->set_defined_in (node->defined_in ()); @@ -779,24 +779,24 @@ be_visitor_amh_pre_proc::generate_set_operation (be_attribute *node) set_op_name->last_component ()->replace_string (new_op_name.c_str ()); // argument type is the same as the attribute type - be_argument *arg = 0; + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, node->field_type (), set_op_name), - 0); + nullptr); arg->set_name (dynamic_cast<UTL_ScopedName *> (node->name ()->copy ())); // create the operation - be_operation *operation = 0; + be_operation *operation = nullptr; ACE_NEW_RETURN (operation, be_operation (be_global->void_type (), AST_Operation::OP_noflags, set_op_name, 0, 0), - 0); + nullptr); operation->set_name (set_op_name); operation->set_defined_in (node->defined_in ()); diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp index c1903159456..4d312589825 100644 --- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp @@ -122,7 +122,7 @@ be_visitor_ami_pre_proc::visit_interface (be_interface *node) AST_Decl *first_stored = node->defined_in ()->lookup_by_name_local (node_lname, false); - if (0 != first_stored && first_stored->node_type () == AST_Decl::NT_home) + if (nullptr != first_stored && first_stored->node_type () == AST_Decl::NT_home) { return 0; } @@ -137,7 +137,7 @@ be_visitor_ami_pre_proc::visit_interface (be_interface *node) AST_Decl *d = s->lookup_by_name_local (&local_id, false); local_id.destroy (); - if (0 != d) + if (nullptr != d) { return 0; } @@ -231,7 +231,7 @@ be_visitor_ami_pre_proc::visit_attribute (be_attribute *node) set_operation->destroy (); delete set_operation; - set_operation = 0; + set_operation = nullptr; } /// Temporarily generate the get operation. @@ -243,7 +243,7 @@ be_visitor_ami_pre_proc::visit_attribute (be_attribute *node) get_operation->destroy (); delete get_operation; - get_operation = 0; + get_operation = nullptr; return 0; } @@ -275,7 +275,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) AST_Type **p_intf = this->create_inheritance_list (node, n_parents); - if (p_intf == 0) + if (p_intf == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_ami_pre_proc::visit_interface - " @@ -283,16 +283,16 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) 0); } - be_interface *reply_handler = 0; + be_interface *reply_handler = nullptr; ACE_NEW_RETURN (reply_handler, be_interface (reply_handler_name, // name p_intf, // list of inherited n_parents, // number of inherited - 0, // list of all ancestors + nullptr, // list of all ancestors 0, // number of ancestors 0, // non-local 0), // non-abstract - 0); + nullptr); // Back to reality. idl_global->scopes ().pop (); @@ -307,7 +307,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) // and set the prefix to the node's prefix. All this is // necessary in case the node's prefix was modified after // its declaration. - reply_handler->AST_Decl::repoID (0); + reply_handler->AST_Decl::repoID (nullptr); reply_handler->prefix (const_cast<char*> (node->prefix ())); reply_handler->gen_fwd_helper_name (); @@ -355,7 +355,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) get_operation->destroy (); delete get_operation; - get_operation = 0; + get_operation = nullptr; if (!attribute->readonly ()) { @@ -370,7 +370,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) set_operation->destroy (); delete set_operation; - set_operation = 0; + set_operation = nullptr; } } } @@ -402,11 +402,11 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) if (node->flags () == AST_Operation::OP_oneway) { // We do nothing for oneways! - return 0; + return nullptr; } - Identifier *id = 0; - UTL_ScopedName *sn = 0; + Identifier *id = nullptr; + UTL_ScopedName *sn = nullptr; // Create the new name // Prepend "sendc_" to the name of the operation @@ -422,14 +422,14 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) idl_global->scopes ().push (node->defined_in ()); // Create the operation - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (be_global->void_type (), AST_Operation::OP_noflags, op_name, false, false), - 0); + nullptr); idl_global->scopes ().pop (); @@ -452,11 +452,11 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) AST_Interface *handler = parent->ami_handler (); - if (0 == handler) + if (nullptr == handler) { op->destroy (); delete op; - op = 0; + op = nullptr; ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ami_pre_proc::") @@ -471,24 +471,24 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) ACE_NEW_RETURN (id, Identifier ("ami_handler"), - 0); + nullptr); - UTL_ScopedName *tmp = 0; + UTL_ScopedName *tmp = nullptr; ACE_NEW_RETURN (tmp, UTL_ScopedName (id, - 0), - 0); + nullptr), + nullptr); sn = (UTL_ScopedName *)op->name ()->copy (); sn->nconc (tmp); - be_argument *arg = 0; + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, field_type, // is also a valuetype sn), - 0); + nullptr); arg->set_defined_in (op); arg->set_name (sn); @@ -528,14 +528,14 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) original_arg->direction () == AST_Argument::dir_INOUT) { // Create the argument. - be_argument *arg = 0; + be_argument *arg = nullptr; UTL_ScopedName *new_name = (UTL_ScopedName *)original_arg->name ()->copy (); ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, original_arg->field_type (), new_name), - 0); + nullptr); arg->set_defined_in (op); arg->set_name (new_name); @@ -565,8 +565,8 @@ be_visitor_ami_pre_proc::create_reply_handler_operation ( return 0; } - Identifier *id = 0; - UTL_ScopedName *sn = 0; + Identifier *id = nullptr; + UTL_ScopedName *sn = nullptr; ACE_CString original_op_name ( node->name ()->last_component ()->get_string () @@ -581,13 +581,13 @@ be_visitor_ami_pre_proc::create_reply_handler_operation ( ACE_NEW_RETURN (sn, UTL_ScopedName (id, - 0), + nullptr), -1); op_name->nconc (sn); // Create the operation. - be_operation *operation = 0; + be_operation *operation = nullptr; ACE_NEW_RETURN (operation, be_operation (be_global->void_type (), AST_Operation::OP_noflags, @@ -606,18 +606,18 @@ be_visitor_ami_pre_proc::create_reply_handler_operation ( Identifier ("ami_return_val"), -1); - UTL_ScopedName *tmp = 0; + UTL_ScopedName *tmp = nullptr; ACE_NEW_RETURN (tmp, UTL_ScopedName (id, - 0), + nullptr), -1); sn = (UTL_ScopedName *)operation->name ()->copy (); sn->nconc (tmp); // Create the argument. - be_argument *arg = 0; + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, node->return_type (), @@ -642,11 +642,11 @@ be_visitor_ami_pre_proc::create_reply_handler_operation ( { AST_Decl *d = si.item (); - if (d == 0) + if (d == nullptr) { operation->destroy (); delete operation; - operation = 0; + operation = nullptr; ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ami_pre_proc::") @@ -662,7 +662,7 @@ be_visitor_ami_pre_proc::create_reply_handler_operation ( original_arg->direction () == AST_Argument::dir_OUT) { // Create the argument. - be_argument *arg = 0; + be_argument *arg = nullptr; UTL_ScopedName *new_name = (UTL_ScopedName *)original_arg->name ()->copy (); ACE_NEW_RETURN (arg, @@ -685,7 +685,7 @@ be_visitor_ami_pre_proc::create_reply_handler_operation ( { UTL_ExceptList *exceptions = node->exceptions (); - if (0 != exceptions) + if (nullptr != exceptions) { operation->be_add_exceptions (exceptions->copy ()); } @@ -693,7 +693,7 @@ be_visitor_ami_pre_proc::create_reply_handler_operation ( // After having generated the operation we insert it into the // reply handler interface. - if (0 == reply_handler->be_add_operation (operation)) + if (nullptr == reply_handler->be_add_operation (operation)) { return -1; } @@ -713,8 +713,8 @@ be_visitor_ami_pre_proc::create_excep_operation (be_operation *node, } // Create the return type, which is "void". - Identifier *id = 0; - UTL_ScopedName *sn = 0; + Identifier *id = nullptr; + UTL_ScopedName *sn = nullptr; // Create the argument. ACE_NEW_RETURN (id, @@ -723,11 +723,11 @@ be_visitor_ami_pre_proc::create_excep_operation (be_operation *node, ACE_NEW_RETURN (sn, UTL_ScopedName (id, - 0), + nullptr), -1); be_valuetype *excep_holder = be_global->messaging_exceptionholder (); - be_argument *arg = 0; + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, excep_holder, // is also a valuetype @@ -754,7 +754,7 @@ be_visitor_ami_pre_proc::create_excep_operation (be_operation *node, ACE_NEW_RETURN (sn, UTL_ScopedName (id, - 0), + nullptr), -1); op_name->nconc (sn); @@ -762,7 +762,7 @@ be_visitor_ami_pre_proc::create_excep_operation (be_operation *node, AST_PredefinedType *rt = be_global->void_type (); // Create the operation. - be_operation *operation = 0; + be_operation *operation = nullptr; ACE_NEW_RETURN (operation, be_operation (rt, AST_Operation::OP_noflags, @@ -785,7 +785,7 @@ be_visitor_ami_pre_proc::create_excep_operation (be_operation *node, // be needed when collocation is disabled. UTL_ExceptList *exceptions = node->exceptions (); - if (0 != exceptions) + if (nullptr != exceptions) { operation->be_add_exceptions (exceptions->copy ()); } @@ -815,7 +815,7 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node) } } - AST_Decl **elements = 0; + AST_Decl **elements = nullptr; ACE_NEW_RETURN (elements, AST_Decl *[number_of_elements], -1); @@ -842,7 +842,7 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node) if (!d) { delete [] elements; - elements = 0; + elements = nullptr; ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_scope::visit_scope - " "bad node in this scope\n"), @@ -866,10 +866,10 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node) this->ctx_->node (bd); // Send the visitor. - if (bd == 0 || bd->accept (this) == -1) + if (bd == nullptr || bd->accept (this) == -1) { delete [] elements; - elements = 0; + elements = nullptr; ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_scope::visit_scope - " "codegen for scope failed\n"), @@ -878,7 +878,7 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node) } // end of while loop delete [] elements; - elements = 0; + elements = nullptr; } // end of if return 0; @@ -910,14 +910,14 @@ be_visitor_ami_pre_proc::generate_get_operation (be_attribute *node) static_cast<UTL_ScopedName *> (node->name ()->copy ()); get_name->last_component ()->replace_string (new_op_name.c_str ()); - be_operation *operation = 0; + be_operation *operation = nullptr; ACE_NEW_RETURN (operation, be_operation (node->field_type (), AST_Operation::OP_noflags, get_name, false, false), - 0); + nullptr); operation->set_name (get_name); operation->set_defined_in (node->defined_in ()); @@ -926,7 +926,7 @@ be_visitor_ami_pre_proc::generate_get_operation (be_attribute *node) // be needed when collocation is disabled. UTL_ExceptList *exceptions = node->get_get_exceptions (); - if (0 != exceptions) + if (nullptr != exceptions) { operation->be_add_exceptions (exceptions->copy ()); } @@ -948,24 +948,24 @@ be_visitor_ami_pre_proc::generate_set_operation (be_attribute *node) set_name->last_component ()->replace_string (new_op_name.c_str ()); // Argument type is the same as the attribute type. - be_argument *arg = 0; + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, node->field_type (), set_name), - 0); + nullptr); arg->set_name ((UTL_ScopedName *) node->name ()->copy ()); // Create the operation. - be_operation *operation = 0; + be_operation *operation = nullptr; ACE_NEW_RETURN (operation, be_operation (be_global->void_type (), AST_Operation::OP_noflags, set_name, false, false), - 0); + nullptr); operation->set_name (set_name); operation->set_defined_in (node->defined_in ()); @@ -975,7 +975,7 @@ be_visitor_ami_pre_proc::generate_set_operation (be_attribute *node) // be needed when collocation is disabled. UTL_ExceptList *exceptions = node->get_set_exceptions (); - if (0 != exceptions) + if (nullptr != exceptions) { operation->be_add_exceptions (exceptions->copy ()); } @@ -988,11 +988,11 @@ AST_Type ** be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node, long &n_rh_parents) { - AST_Type **retval = 0; + AST_Type **retval = nullptr; long const n_parents = node->n_inherits (); AST_Type **parents = node->inherits (); - AST_Type *parent = 0; + AST_Type *parent = nullptr; for (long i = 0; i < n_parents; ++i) { @@ -1012,7 +1012,7 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node, ACE_NEW_RETURN (retval, AST_Type *[1], - 0); + nullptr); retval[0] = inherit_intf; n_rh_parents = 1; @@ -1021,7 +1021,7 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node, { ACE_NEW_RETURN (retval, AST_Type *[n_rh_parents], - 0); + nullptr); ACE_CString prefix ("AMI_"); @@ -1051,7 +1051,7 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node, node->defined_in ()->lookup_by_name (rh_parent_name, true); - if (d != 0) + if (d != nullptr) { retval[index] = dynamic_cast<AST_Interface*> (d); retval[index++]->set_prefix_with_typeprefix (parent->prefix () ? @@ -1061,7 +1061,7 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node, rh_parent_name->destroy (); delete rh_parent_name; - rh_parent_name = 0; + rh_parent_name = nullptr; } // Just a sanity check until we're sure this works in all use cases. @@ -1115,7 +1115,7 @@ be_visitor_ami_pre_proc::generate_ami4ccm_idl (void) ! i.done (); i.advance ()) { - char **item = 0; + char **item = nullptr; i.next (item); UTL_ScopedName *sn = @@ -1126,25 +1126,25 @@ be_visitor_ami_pre_proc::generate_ami4ccm_idl (void) AST_Decl *d = s->lookup_by_name (sn, true); - if (d == 0) + if (d == nullptr) { idl_global->err ()->lookup_error (sn); sn->destroy (); delete sn; - sn = 0; + sn = nullptr; continue; } sn->destroy (); delete sn; - sn = 0; + sn = nullptr; be_interface *iface = dynamic_cast<be_interface*> (d); - if (iface == 0) + if (iface == nullptr) { idl_global->err ()->interface_expected (d); continue; diff --git a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp index 9a16e7d7ced..743a429e301 100644 --- a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp @@ -157,7 +157,7 @@ be_visitor_any_extracted_type_decl::visit_sequence (be_sequence *node) { be_type *bt = this->ctx_->alias (); - if (bt == 0) + if (bt == nullptr) { bt = node; } @@ -203,7 +203,7 @@ be_visitor_any_extracted_type_decl::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp index b1528b48f1c..8eee5d3ec5f 100644 --- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp @@ -484,14 +484,14 @@ be_visitor_arg_traits::visit_operation (be_operation *node) int be_visitor_arg_traits::visit_attribute (be_attribute *node) { - if (this->ctx_->alias () != 0 || this->generated (node)) + if (this->ctx_->alias () != nullptr || this->generated (node)) { return 0; } AST_String *st = dynamic_cast<AST_String*> (node->field_type ()); - if (st == 0) + if (st == nullptr) { return 0; } @@ -559,7 +559,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node) int be_visitor_arg_traits::visit_argument (be_argument *node) { - if (this->ctx_->alias () != 0 || this->generated (node)) + if (this->ctx_->alias () != nullptr || this->generated (node)) { return 0; } @@ -674,7 +674,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node) be_typedef *alias = this->ctx_->alias (); /// No arg traits for anonymous sequences. - if (alias == 0) + if (alias == nullptr) { return 0; } @@ -741,7 +741,7 @@ be_visitor_arg_traits::visit_string (be_string *node) // since a bounded (w)string of the same length may be used or typedef'd // more than once. - if (alias == 0) + if (alias == nullptr) { os->gen_ifdef_macro (node->flat_name (), guard_suffix.c_str (), false); } @@ -758,14 +758,14 @@ be_visitor_arg_traits::visit_string (be_string *node) } size_t bound_length = num_digits + 1; - char* bound_string = 0; + char* bound_string = nullptr; ACE_NEW_RETURN (bound_string, char[bound_length], -1) ; ACE_OS::sprintf (bound_string, ACE_UINT32_FORMAT_SPECIFIER_ASCII, bound); size_t cat_length = ACE_OS::strlen (alias->local_name ()->get_string ()) + ACE_OS::strlen (bound_string) + 1; - char* cat_string = 0; + char* cat_string = nullptr; ACE_NEW_RETURN (cat_string, char[cat_length], -1) ; ACE_OS::strcpy (cat_string, alias->local_name ()->get_string ()) ; ACE_OS::strcat (cat_string, bound_string); @@ -785,7 +785,7 @@ be_visitor_arg_traits::visit_string (be_string *node) *os << be_nl_2 << "struct "; - if (alias == 0) + if (alias == nullptr) { *os << node->flat_name (); } @@ -802,7 +802,7 @@ be_visitor_arg_traits::visit_string (be_string *node) << "class " << this->S_ << "Arg_Traits<"; - if (0 == alias) + if (nullptr == alias) { *os << node->flat_name (); } @@ -845,7 +845,7 @@ be_visitor_arg_traits::visit_array (be_array *node) // Add the alias check here because anonymous arrays can't be // operation arguments. - if (this->generated (node) || this->ctx_->alias () == 0) + if (this->generated (node) || this->ctx_->alias () == nullptr) { return 0; } @@ -1172,7 +1172,7 @@ be_visitor_arg_traits::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp index 2815a5a50c9..86e9a04f458 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp @@ -280,7 +280,7 @@ int be_visitor_args_arglist::visit_sequence (be_sequence *node) // then 'type_name' below will output 'sequence'. if (node->imported () && node->anonymous ()) { - (void) node->create_name (0); + (void) node->create_name (nullptr); } TAO_OutStream *os = this->ctx_->stream (); @@ -417,7 +417,7 @@ int be_visitor_args_arglist::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); 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 6162775336a..eb00fc3af60 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp @@ -39,7 +39,7 @@ be_visitor_args::type_name (be_type *node, '\0', NAMEBUFSIZE); - be_type *bt = 0; + be_type *bt = nullptr; // Use the typedefed name if that is the one // used in the IDL defn. diff --git a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp index c5944774095..1d29b63b725 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp @@ -402,7 +402,7 @@ int be_visitor_args_invoke_cs::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp index 4c6294b0ad1..d1246f9c4e3 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp @@ -394,7 +394,7 @@ int be_visitor_args_marshal_ss::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); 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 bf59b624591..bcb4afbd2c6 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp @@ -307,7 +307,7 @@ int be_visitor_args_upcall_ss::visit_typedef ( -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } 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 c6326c6afcd..d0ca1908a4b 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp @@ -66,7 +66,7 @@ int be_visitor_args_vardecl_ss::visit_array ( TAO_OutStream *os = this->ctx_->stream (); be_argument *arg = dynamic_cast<be_argument*> (this->ctx_->node ()); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -114,7 +114,7 @@ int be_visitor_args_vardecl_ss::visit_enum (be_enum *node) TAO_OutStream *os = this->ctx_->stream (); be_argument *arg = dynamic_cast<be_argument*> (this->ctx_->node ()); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -176,7 +176,7 @@ int be_visitor_args_vardecl_ss::visit_predefined_type ( TAO_OutStream *os = this->ctx_->stream (); be_argument *arg = dynamic_cast<be_argument*> (this->ctx_->node ()); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -261,7 +261,7 @@ int be_visitor_args_vardecl_ss::visit_sequence ( TAO_OutStream *os = this->ctx_->stream (); be_argument *arg = dynamic_cast<be_argument*> (this->ctx_->node ()); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -358,7 +358,7 @@ int be_visitor_args_vardecl_ss::visit_typedef ( -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -402,7 +402,7 @@ be_visitor_args_vardecl_ss::emit_common ( TAO_OutStream *os = this->ctx_->stream (); be_argument *arg = dynamic_cast<be_argument*> (this->ctx_->node ()); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -439,7 +439,7 @@ be_visitor_args_vardecl_ss::emit_common2 (be_type *node) TAO_OutStream *os = this->ctx_->stream (); be_argument *arg = dynamic_cast<be_argument*> (this->ctx_->node ()); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp index 163c65fc6e5..030d1358756 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp @@ -88,7 +88,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) << be_idt << be_idt_nl << "_tao_any," << be_nl << node->name () << "_forany::_tao_any_destructor," << be_nl - << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl + << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem.nocopy ()" << be_idt_nl << "? _tao_elem.ptr ()" << be_nl << ": " @@ -108,7 +108,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) << ">::extract (" << be_idt << be_idt_nl << "_tao_any," << be_nl << node->name () << "_forany::_tao_any_destructor," << be_nl - << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl + << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem.out ()" << be_uidt_nl << ");" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_array/array.cpp b/TAO/TAO_IDL/be/be_visitor_array/array.cpp index 28ab78b534d..c98b321b6f2 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array.cpp @@ -169,7 +169,7 @@ int be_visitor_array::visit_node (be_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -196,7 +196,7 @@ int be_visitor_array::emit_common (be_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp index affd9b6e14d..eec3b5f8f76 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp @@ -70,7 +70,7 @@ int be_visitor_array_ch::visit_array (be_array *node) // If the array is an anonymous member and if its element type // is a declaration (not a reference), we must generate code for // the declaration. - if (this->ctx_->alias () == 0 // Not a typedef. + if (this->ctx_->alias () == nullptr // Not a typedef. && bt->is_child (this->ctx_->scope ()->decl ())) { int status = 0; @@ -126,7 +126,7 @@ int be_visitor_array_ch::visit_array (be_array *node) be_typedef *td = this->ctx_->tdef (); - if (td == 0) + if (td == nullptr) { // We are dealing with an anonymous array case. Generate a typedef with // an _ prepended to the name. @@ -165,7 +165,7 @@ int be_visitor_array_ch::visit_array (be_array *node) '\0', 2); - if (this->ctx_->tdef () != 0) + if (this->ctx_->tdef () != nullptr) { anon_p[0] = '\0'; } @@ -193,7 +193,7 @@ int be_visitor_array_ch::visit_array (be_array *node) << " {};" << be_nl; // No _var or _out class for an anonymous (non-typedef'd) array. - if (td != 0) + if (td != nullptr) { // Generate _var class decl. // An _out decl is generated only for a variable size array. @@ -270,7 +270,7 @@ int be_visitor_array_ch::visit_array (be_array *node) storage_class = storage_class + " "; } - if (td != 0) + if (td != nullptr) { // Typedefed array. *os << storage_class.c_str() << node->nested_type_name (scope, "_slice") diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp index a57454afa0f..724626e31a2 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -61,7 +61,7 @@ int be_visitor_array_ci::visit_array (be_array *node) // If the array is an anonymous member and if its element type // is a declaration (not a reference), we must generate code for // the declaration. - if (this->ctx_->alias () == 0 // Not a typedef. + if (this->ctx_->alias () == nullptr // Not a typedef. && bt->is_child (this->ctx_->scope ()->decl ())) { int status = 0; @@ -220,7 +220,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << "{" << be_idt_nl; ACE_CDR::ULong ndims = node->n_dims (); - be_array *primitive_type = 0; + be_array *primitive_type = nullptr; if (bt->node_type () == AST_Decl::NT_typedef) { @@ -249,7 +249,7 @@ int be_visitor_array_ci::visit_array (be_array *node) // Retrieve the ith dimension value. AST_Expression *expr = node->dims ()[i]; - if ((expr == 0) || ((expr != 0) && (expr->ev () == 0))) + if ((expr == nullptr) || ((expr != nullptr) && (expr->ev () == nullptr))) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_array_cs::" diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp index 310c641cb70..34ccc617a61 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp @@ -164,7 +164,7 @@ int be_visitor_array_cs::visit_array (be_array *node) // Retrieve the ith dimension value. AST_Expression *expr = node->dims ()[i]; - if ((expr == 0) || ((expr != 0) && (expr->ev () == 0))) + if ((expr == nullptr) || ((expr != nullptr) && (expr->ev () == nullptr))) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_array_cs::" @@ -192,7 +192,7 @@ int be_visitor_array_cs::visit_array (be_array *node) // Now generate code such that every element of the array gets assigned // inside the innermost level of the nested loops generated above. - be_array *primitive_type = 0; + be_array *primitive_type = nullptr; if (bt->node_type () == AST_Decl::NT_typedef) { @@ -213,7 +213,7 @@ int be_visitor_array_cs::visit_array (be_array *node) primitive_type = dynamic_cast<be_array*> (tmp); } - if (primitive_type != 0) + if (primitive_type != nullptr) { // The base type is a typedef to another array type, so // we use the base type's copy method. @@ -297,7 +297,7 @@ int be_visitor_array_cs::visit_array (be_array *node) // If the member's element type // is a declaration (not a reference), we must generate code for // the declaration. - if (this->ctx_->alias () == 0 // Not a typedef. + if (this->ctx_->alias () == nullptr // Not a typedef. && bt->is_child (this->ctx_->scope ()->decl ())) { int status = 0; diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp index 2f57e164eee..c0095d458df 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp @@ -55,7 +55,7 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node) // If the array is an anonymous member and if its element type // is a declaration (not a reference), we must generate code for // the declaration. - if (this->ctx_->alias () == 0 && // Not a typedef. + if (this->ctx_->alias () == nullptr && // Not a typedef. bt->is_child (this->ctx_->scope ()->decl ())) { int status = 0; @@ -105,7 +105,7 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node) be_typedef *td = this->ctx_->tdef (); ACE_CString arg_name (ACE_CString (parent->full_name ()) + "::" - + (td == 0 ? "_" : "") + + (td == nullptr ? "_" : "") + node->local_name ()->get_string () + "_forany &_tao_array"); diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp index 9fb7f847b38..5ee8fc0b448 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp @@ -74,7 +74,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node) // If the array is an anonymous member and if its element type // is a declaration (not a reference), we must generate code for // the declaration. - if (this->ctx_->alias () == 0 // Not a typedef. + if (this->ctx_->alias () == nullptr // Not a typedef. && bt->is_child (this->ctx_->scope ()->decl ())) { int status = 0; @@ -124,7 +124,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node) '\0', NAMEBUFSIZE); - bool use_underscore = (this->ctx_->tdef () == 0); + bool use_underscore = (this->ctx_->tdef () == nullptr); if (!use_underscore) { @@ -288,7 +288,7 @@ be_visitor_array_cdr_op_cs::visit_predefined_type ( be_array *array = dynamic_cast<be_array*> (this->ctx_->node ()); - if (array == 0) + if (array == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_array_cdr_op_cs::" @@ -465,7 +465,7 @@ be_visitor_array_cdr_op_cs::visit_predefined_type ( // Retrieve the ith dimension value. AST_Expression *expr = array->dims ()[i]; - if ((expr == 0) || ((expr != 0) && (expr->ev () == 0))) + if ((expr == nullptr) || ((expr != nullptr) && (expr->ev () == nullptr))) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_array_cdr_op_cs::" @@ -542,7 +542,7 @@ be_visitor_array_cdr_op_cs::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -556,7 +556,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt) dynamic_cast<be_array*> (this->ctx_->node ()); AST_Decl::NodeType nt = bt->node_type (); - if (node == 0) + if (node == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_array_cdr_op_cs::" @@ -580,7 +580,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt) // Retrieve the ith dimension value. AST_Expression *expr = node->dims ()[i]; - if ((expr == 0) || ((expr != 0) && (expr->ev () == 0))) + if ((expr == nullptr) || ((expr != nullptr) && (expr->ev () == nullptr))) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_array_cdr_op_cs::" @@ -633,7 +633,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt) } else { - be_string *str = 0; + be_string *str = nullptr; if (bt->node_type () == AST_Decl::NT_string || bt->node_type () == AST_Decl::NT_wstring) { @@ -649,7 +649,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt) } *os << "_tao_marshal_flag = (strm >> "; - if (str != 0 && str->max_size ()->ev ()->u.ulval != 0) + if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0) { if (str->width () == (long) sizeof (char)) { @@ -760,7 +760,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt) } else { - be_string *str = 0; + be_string *str = nullptr; if (bt->node_type () == AST_Decl::NT_string || bt->node_type () == AST_Decl::NT_wstring) { @@ -776,7 +776,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt) } *os << "_tao_marshal_flag = (strm << "; - if (str != 0 && str->max_size ()->ev ()->u.ulval != 0) + if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0) { if (str->width () == (long) sizeof (char)) { diff --git a/TAO/TAO_IDL/be/be_visitor_attr_assign.cpp b/TAO/TAO_IDL/be/be_visitor_attr_assign.cpp index 692367b1245..f348ac69cea 100644 --- a/TAO/TAO_IDL/be/be_visitor_attr_assign.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attr_assign.cpp @@ -18,7 +18,7 @@ be_visitor_attr_assign::be_visitor_attr_assign ( be_visitor_context *ctx) : be_visitor_decl (ctx), - attr_name_ (0), + attr_name_ (nullptr), attr_name_string_ ("this->") { } @@ -110,7 +110,7 @@ be_visitor_attr_assign::visit_sequence (be_sequence *) { be_type *bt = this->ctx_->alias (); - if (bt == 0) + if (bt == nullptr) { /// Support anonymous types? return -1; @@ -167,7 +167,7 @@ be_visitor_attr_assign::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_attr_return.cpp b/TAO/TAO_IDL/be/be_visitor_attr_return.cpp index 4ff0e93139e..3188dc0ac90 100644 --- a/TAO/TAO_IDL/be/be_visitor_attr_return.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attr_return.cpp @@ -146,7 +146,7 @@ be_visitor_attr_return::visit_sequence (be_sequence *) { be_type *bt = this->ctx_->alias (); - if (bt == 0) + if (bt == nullptr) { /// Support anonymous types? return -1; @@ -222,7 +222,7 @@ be_visitor_attr_return::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp b/TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp index 6dc5900e433..ef3fe9132b3 100644 --- a/TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp @@ -30,7 +30,7 @@ be_visitor_attr_setarg_type::visit_array (be_array *) { be_type *bt = this->ctx_->alias (); - if (bt == 0) + if (bt == nullptr) { /// Support anonymous types? return -1; @@ -107,7 +107,7 @@ be_visitor_attr_setarg_type::visit_sequence (be_sequence *) { be_type *bt = this->ctx_->alias (); - if (bt == 0) + if (bt == nullptr) { /// Support anonymous types? return -1; @@ -156,7 +156,7 @@ be_visitor_attr_setarg_type::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp index 77337f29a73..3e9f53f2540 100644 --- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp @@ -40,7 +40,7 @@ be_visitor_attribute::be_visitor_attribute (be_visitor_context *ctx) : be_visitor_decl (ctx), for_facets_ (false), - op_scope_ (0), + op_scope_ (nullptr), exec_class_extension_ ("_exec_i") { } @@ -59,14 +59,14 @@ be_visitor_attribute::visit_attribute (be_attribute *node) AST_Decl *d = ScopeAsDecl (s); ACE_CString op_name (this->ctx_->port_prefix ()); op_name += node->local_name ()->get_string (); - Identifier *op_id = 0; + Identifier *op_id = nullptr; ACE_NEW_RETURN (op_id, Identifier (op_name.c_str ()), -1); - UTL_ScopedName *op_ln = 0; + UTL_ScopedName *op_ln = nullptr; ACE_NEW_RETURN (op_ln, - UTL_ScopedName (op_id, 0), + UTL_ScopedName (op_id, nullptr), -1); UTL_ScopedName *op_sn = @@ -76,7 +76,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node) // first the "get" operation be_operation get_op (node->field_type (), AST_Operation::OP_noflags, - 0, + nullptr, node->is_local (), node->is_abstract ()); @@ -84,7 +84,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node) get_op.set_name (op_sn); UTL_ExceptList *get_exceptions = node->get_get_exceptions (); - if (0 != get_exceptions) + if (nullptr != get_exceptions) { get_op.be_add_exceptions (get_exceptions->copy ()); } @@ -229,7 +229,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node) // Create the set method. Identifier id ("void"); UTL_ScopedName sn (&id, - 0); + nullptr); // The return type is "void". be_predefined_type rt (AST_PredefinedType::PT_void, @@ -246,7 +246,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node) // Create the operation. be_operation set_op (&rt, AST_Operation::OP_noflags, - 0, + nullptr, node->is_local (), node->is_abstract ()); set_op.set_defined_in (node->defined_in ()); @@ -255,7 +255,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node) UTL_ExceptList *set_exceptions = node->get_set_exceptions (); - if (0 != set_exceptions) + if (nullptr != set_exceptions) { set_op.be_add_exceptions (set_exceptions->copy ()); } diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp index 0c37a02e21a..8c23987cac9 100644 --- a/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp @@ -15,7 +15,7 @@ be_visitor_attribute_ccm_init::be_visitor_attribute_ccm_init ( be_visitor_context *ctx) : be_visitor_any_extracted_type_decl (ctx), - attr_ (0) + attr_ (nullptr) { } @@ -35,7 +35,7 @@ be_visitor_attribute_ccm_init::visit_attribute ( be_interface *intf = this->ctx_->interface (); - if (intf != 0) + if (intf != nullptr) { AST_Decl::NodeType snt = intf->node_type (); AST_Decl::NodeType ant = diff --git a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp index 87bdac3da60..4f8c7e572f6 100644 --- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp @@ -74,19 +74,19 @@ be_visitor_ccm_pre_proc::be_visitor_ccm_pre_proc ( be_visitor_context *ctx) : be_visitor_component_scope (ctx), module_id_ ("Components"), - cookie_ (0), - already_connected_ (0), - invalid_connection_ (0), - no_connection_ (0), - exceeded_connection_limit_ (0), - create_failure_ (0), - remove_failure_ (0), - finder_failure_ (0), - invalid_key_ (0), - unknown_key_value_ (0), - duplicate_key_value_ (0), - comp_ (0), - home_ (0), + cookie_ (nullptr), + already_connected_ (nullptr), + invalid_connection_ (nullptr), + no_connection_ (nullptr), + exceeded_connection_limit_ (nullptr), + create_failure_ (nullptr), + remove_failure_ (nullptr), + finder_failure_ (nullptr), + invalid_key_ (nullptr), + unknown_key_value_ (nullptr), + duplicate_key_value_ (nullptr), + comp_ (nullptr), + home_ (nullptr), ccm_lookups_done_ (false) { } @@ -212,16 +212,16 @@ be_visitor_ccm_pre_proc::visit_provides (be_provides *node) ACE_CString prefix ("provide_"); prefix += this->ctx_->port_prefix (); - AST_Operation *provides_op = 0; + AST_Operation *provides_op = nullptr; UTL_ScopedName *op_name = this->create_scoped_name (prefix.c_str (), node->local_name ()->get_string (), - 0, + nullptr, comp_); ACE_NEW_RETURN (provides_op, be_operation (node->provides_type (), AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); @@ -230,7 +230,7 @@ be_visitor_ccm_pre_proc::visit_provides (be_provides *node) provides_op->set_imported (comp_->imported ()); provides_op->set_name (op_name); - if (0 == comp_->be_add_operation (provides_op)) + if (nullptr == comp_->be_add_operation (provides_op)) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ccm_pre_proc::") @@ -390,7 +390,7 @@ be_visitor_ccm_pre_proc::visit_home (be_home *node) { AST_Interface *xplicit = this->create_explicit (node); - if (xplicit == 0) + if (xplicit == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ccm_pre_proc::") @@ -401,7 +401,7 @@ be_visitor_ccm_pre_proc::visit_home (be_home *node) AST_Interface *implicit = this->create_implicit (node); - if (implicit == 0) + if (implicit == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ccm_pre_proc::") @@ -420,7 +420,7 @@ be_visitor_ccm_pre_proc::visit_home (be_home *node) -1); } - if (this->create_equivalent (node, xplicit, implicit) == 0) + if (this->create_equivalent (node, xplicit, implicit) == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ccm_pre_proc::") @@ -480,7 +480,7 @@ be_visitor_ccm_pre_proc::gen_implicit_ops (be_home *node, AST_Type *pk = node->primary_key (); - if (pk == 0) + if (pk == nullptr) { return 0; } @@ -534,13 +534,13 @@ be_visitor_ccm_pre_proc::gen_connect_single (be_uses *node) UTL_ScopedName *op_full_name = this->create_scoped_name (prefix.c_str (), node->local_name ()->get_string (), - 0, + nullptr, comp_); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (be_global->void_type (), AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); @@ -549,8 +549,8 @@ be_visitor_ccm_pre_proc::gen_connect_single (be_uses *node) op->set_name (op_full_name); Identifier arg_id ("conxn"); UTL_ScopedName arg_name (&arg_id, - 0); - be_argument *arg = 0; + nullptr); + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, node->uses_type (), @@ -559,19 +559,19 @@ be_visitor_ccm_pre_proc::gen_connect_single (be_uses *node) arg_id.destroy (); op->be_add_argument (arg); - UTL_ExceptList *tail = 0; + UTL_ExceptList *tail = nullptr; ACE_NEW_RETURN (tail, UTL_ExceptList (this->invalid_connection_, - 0), + nullptr), -1); - UTL_ExceptList *connect_single = 0; + UTL_ExceptList *connect_single = nullptr; ACE_NEW_RETURN (connect_single, UTL_ExceptList (this->already_connected_, tail), -1); op->be_add_exceptions (connect_single); - if (0 == comp_->be_add_operation (op)) + if (nullptr == comp_->be_add_operation (op)) { return -1; } @@ -590,27 +590,27 @@ be_visitor_ccm_pre_proc::gen_disconnect_single (be_uses *node) UTL_ScopedName *op_full_name = this->create_scoped_name (prefix.c_str (), node->local_name ()->get_string (), - 0, + nullptr, comp_); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (node->uses_type (), AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); op->set_name (op_full_name); op->set_defined_in (comp_); op->set_imported (comp_->imported ()); - UTL_ExceptList *disconnect_single = 0; + UTL_ExceptList *disconnect_single = nullptr; ACE_NEW_RETURN (disconnect_single, UTL_ExceptList (this->no_connection_, - 0), + nullptr), -1); op->be_add_exceptions (disconnect_single); - if (0 == comp_->be_add_operation (op)) + if (nullptr == comp_->be_add_operation (op)) { return -1; } @@ -629,13 +629,13 @@ be_visitor_ccm_pre_proc::gen_get_connection_single (be_uses *node) UTL_ScopedName *op_full_name = this->create_scoped_name (prefix.c_str (), node->local_name ()->get_string (), - 0, + nullptr, comp_); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (node->uses_type (), AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); @@ -643,7 +643,7 @@ be_visitor_ccm_pre_proc::gen_get_connection_single (be_uses *node) op->set_defined_in (comp_); op->set_imported (comp_->imported ()); - if (0 == comp_->be_add_operation (op)) + if (nullptr == comp_->be_add_operation (op)) { return -1; } @@ -662,14 +662,14 @@ be_visitor_ccm_pre_proc::gen_connect_multiple (be_uses *node) UTL_ScopedName *op_full_name = this->create_scoped_name (prefix.c_str (), node->local_name ()->get_string (), - 0, + nullptr, comp_); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (this->cookie_, AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); @@ -678,8 +678,8 @@ be_visitor_ccm_pre_proc::gen_connect_multiple (be_uses *node) op->set_imported (comp_->imported ()); Identifier arg_id ("connection"); UTL_ScopedName arg_name (&arg_id, - 0); - be_argument *arg = 0; + nullptr); + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, node->uses_type (), @@ -687,19 +687,19 @@ be_visitor_ccm_pre_proc::gen_connect_multiple (be_uses *node) -1); arg_id.destroy (); op->be_add_argument (arg); - UTL_ExceptList *tail = 0; + UTL_ExceptList *tail = nullptr; ACE_NEW_RETURN (tail, UTL_ExceptList (this->invalid_connection_, - 0), + nullptr), -1); - UTL_ExceptList *connect_multiple = 0; + UTL_ExceptList *connect_multiple = nullptr; ACE_NEW_RETURN (connect_multiple, UTL_ExceptList (this->exceeded_connection_limit_, tail), -1); op->be_add_exceptions (connect_multiple); - if (0 == comp_->be_add_operation (op)) + if (nullptr == comp_->be_add_operation (op)) { return -1; } @@ -718,13 +718,13 @@ be_visitor_ccm_pre_proc::gen_disconnect_multiple (be_uses *node) UTL_ScopedName *op_full_name = this->create_scoped_name (prefix.c_str (), node->local_name ()->get_string (), - 0, + nullptr, comp_); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (node->uses_type (), AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); @@ -733,8 +733,8 @@ be_visitor_ccm_pre_proc::gen_disconnect_multiple (be_uses *node) op->set_imported (comp_->imported ()); Identifier arg_id ("ck"); UTL_ScopedName arg_name (&arg_id, - 0); - be_argument *arg = 0; + nullptr); + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, this->cookie_, @@ -742,14 +742,14 @@ be_visitor_ccm_pre_proc::gen_disconnect_multiple (be_uses *node) -1); arg_id.destroy (); op->be_add_argument (arg); - UTL_ExceptList *disconnect_multiple = 0; + UTL_ExceptList *disconnect_multiple = nullptr; ACE_NEW_RETURN (disconnect_multiple, UTL_ExceptList (this->invalid_connection_, - 0), + nullptr), -1); op->be_add_exceptions (disconnect_multiple); - if (0 == comp_->be_add_operation (op)) + if (nullptr == comp_->be_add_operation (op)) { return -1; } @@ -768,7 +768,7 @@ be_visitor_ccm_pre_proc::gen_get_connection_multiple (be_uses *node) UTL_ScopedName *op_full_name = this->create_scoped_name (prefix.c_str (), node->local_name ()->get_string (), - 0, + nullptr, comp_); // Look up the implied IDL typedef created in the front end. @@ -780,17 +780,17 @@ be_visitor_ccm_pre_proc::gen_get_connection_multiple (be_uses *node) connections_string += "Connections"; Identifier connections_id (connections_string.c_str ()); UTL_ScopedName connections_name (&connections_id, - 0); + nullptr); AST_Decl *d = comp_->lookup_by_name (&connections_name, true); be_typedef *td = dynamic_cast<be_typedef*> (d); connections_id.destroy (); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (td, AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); @@ -798,7 +798,7 @@ be_visitor_ccm_pre_proc::gen_get_connection_multiple (be_uses *node) op->set_defined_in (comp_); op->set_imported (comp_->imported ()); - if (0 == comp_->be_add_operation (op)) + if (nullptr == comp_->be_add_operation (op)) { return -1; } @@ -815,13 +815,13 @@ be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node, UTL_ScopedName *op_full_name = this->create_scoped_name ("push_", node->local_name (), - 0, + nullptr, consumer); - be_operation *push_op = 0; + be_operation *push_op = nullptr; ACE_NEW_RETURN (push_op, be_operation (be_global->void_type (), AST_Operation::OP_noflags, - 0, + nullptr, false, false), -1); @@ -829,13 +829,13 @@ be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node, push_op->set_imported (node->imported ()); push_op->set_name (op_full_name); ACE_CString arg_string ("the_", - 0, + nullptr, false); arg_string += node->local_name (); Identifier arg_id (arg_string.fast_rep ()); UTL_ScopedName arg_name (&arg_id, - 0); - be_argument *arg = 0; + nullptr); + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, node, @@ -844,7 +844,7 @@ be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node, arg_id.destroy (); push_op->be_add_argument (arg); - if (0 == consumer->be_add_operation (push_op)) + if (nullptr == consumer->be_add_operation (push_op)) { return -1; } @@ -863,13 +863,13 @@ be_visitor_ccm_pre_proc::gen_subscribe (be_publishes *node) UTL_ScopedName *op_name = this->create_scoped_name ("subscribe_", node->local_name ()->get_string (), - 0, + nullptr, comp_); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (this->cookie_, AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); @@ -879,11 +879,11 @@ be_visitor_ccm_pre_proc::gen_subscribe (be_publishes *node) AST_Interface *i = this->lookup_consumer (node); - if (i == 0) + if (i == nullptr) { op->destroy (); delete op; - op = 0; + op = nullptr; ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ccm_pre_proc::") @@ -894,22 +894,22 @@ be_visitor_ccm_pre_proc::gen_subscribe (be_publishes *node) Identifier arg_id ("consumer"); UTL_ScopedName arg_name (&arg_id, - 0); - be_argument *arg = 0; + nullptr); + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, i, &arg_name), -1); op->be_add_argument (arg); - UTL_ExceptList *subscribe = 0; + UTL_ExceptList *subscribe = nullptr; ACE_NEW_RETURN (subscribe, UTL_ExceptList (this->exceeded_connection_limit_, - 0), + nullptr), -1); op->be_add_exceptions (subscribe); - if (0 == comp_->be_add_operation (op)) + if (nullptr == comp_->be_add_operation (op)) { return -1; } @@ -927,7 +927,7 @@ be_visitor_ccm_pre_proc::gen_unsubscribe (be_publishes *node) AST_Interface *i = this->lookup_consumer (node); - if (i == 0) + if (i == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ccm_pre_proc::") @@ -939,13 +939,13 @@ be_visitor_ccm_pre_proc::gen_unsubscribe (be_publishes *node) UTL_ScopedName *op_name = this->create_scoped_name ("unsubscribe_", node->local_name ()->get_string (), - 0, + nullptr, comp_); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (i, AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); @@ -954,22 +954,22 @@ be_visitor_ccm_pre_proc::gen_unsubscribe (be_publishes *node) op->set_name (op_name); Identifier arg_id ("ck"); UTL_ScopedName arg_name (&arg_id, - 0); - be_argument *arg = 0; + nullptr); + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, this->cookie_, &arg_name), -1); op->be_add_argument (arg); - UTL_ExceptList *unsubscribe = 0; + UTL_ExceptList *unsubscribe = nullptr; ACE_NEW_RETURN (unsubscribe, UTL_ExceptList (this->invalid_connection_, - 0), + nullptr), -1); op->be_add_exceptions (unsubscribe); - if (0 == comp_->be_add_operation (op)) + if (nullptr == comp_->be_add_operation (op)) { return -1; } @@ -988,13 +988,13 @@ be_visitor_ccm_pre_proc::gen_emits_connect (be_emits *node) UTL_ScopedName *op_name = this->create_scoped_name ("connect_", node->local_name ()->get_string (), - 0, + nullptr, comp_); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (be_global->void_type (), AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); @@ -1003,11 +1003,11 @@ be_visitor_ccm_pre_proc::gen_emits_connect (be_emits *node) op->set_imported (comp_->imported ()); AST_Interface *i = this->lookup_consumer (node); - if (i == 0) + if (i == nullptr) { op->destroy (); delete op; - op = 0; + op = nullptr; ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ccm_pre_proc::") @@ -1018,22 +1018,22 @@ be_visitor_ccm_pre_proc::gen_emits_connect (be_emits *node) Identifier arg_id ("consumer"); UTL_ScopedName arg_name (&arg_id, - 0); - be_argument *arg = 0; + nullptr); + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, i, &arg_name), -1); op->be_add_argument (arg); - UTL_ExceptList *emits_connect = 0; + UTL_ExceptList *emits_connect = nullptr; ACE_NEW_RETURN (emits_connect, UTL_ExceptList (this->already_connected_, - 0), + nullptr), -1); op->be_add_exceptions (emits_connect); - if (0 == comp_->be_add_operation (op)) + if (nullptr == comp_->be_add_operation (op)) { return -1; } @@ -1051,7 +1051,7 @@ be_visitor_ccm_pre_proc::gen_emits_disconnect (be_emits *node) AST_Interface *i = this->lookup_consumer (node); - if (i == 0) + if (i == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ccm_pre_proc::") @@ -1063,27 +1063,27 @@ be_visitor_ccm_pre_proc::gen_emits_disconnect (be_emits *node) UTL_ScopedName *op_name = this->create_scoped_name ("disconnect_", node->local_name ()->get_string (), - 0, + nullptr, comp_); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (i, AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); op->set_name (op_name); op->set_defined_in (comp_); op->set_imported (comp_->imported ()); - UTL_ExceptList *emits_disconnect = 0; + UTL_ExceptList *emits_disconnect = nullptr; ACE_NEW_RETURN (emits_disconnect, UTL_ExceptList (this->no_connection_, - 0), + nullptr), -1); op->be_add_exceptions (emits_disconnect); - if (0 == comp_->be_add_operation (op)) + if (nullptr == comp_->be_add_operation (op)) { return -1; } @@ -1101,7 +1101,7 @@ be_visitor_ccm_pre_proc::gen_get_consumer (be_consumes *node) AST_Interface *i = this->lookup_consumer (node); - if (i == 0) + if (i == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ccm_pre_proc::") @@ -1113,13 +1113,13 @@ be_visitor_ccm_pre_proc::gen_get_consumer (be_consumes *node) UTL_ScopedName *op_name = this->create_scoped_name ("get_consumer_", node->local_name ()->get_string (), - 0, + nullptr, comp_); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (i, AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); @@ -1127,7 +1127,7 @@ be_visitor_ccm_pre_proc::gen_get_consumer (be_consumes *node) op->set_defined_in (comp_); op->set_imported (comp_->imported ()); - if (0 == comp_->be_add_operation (op)) + if (nullptr == comp_->be_add_operation (op)) { return -1; } @@ -1139,32 +1139,32 @@ int be_visitor_ccm_pre_proc::gen_create (be_home *node, AST_Interface *implicit) { - UTL_ScopedName *op_name = this->create_scoped_name (0, + UTL_ScopedName *op_name = this->create_scoped_name (nullptr, "create", - 0, + nullptr, implicit); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (node->managed_component (), AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); op->set_name (op_name); AST_Type *pk = node->primary_key (); - UTL_ExceptList *exceps = 0; + UTL_ExceptList *exceps = nullptr; ACE_NEW_RETURN (exceps, UTL_ExceptList (this->create_failure_, - 0), + nullptr), -1); - if (pk != 0 && !be_global->gen_lwccm ()) + if (pk != nullptr && !be_global->gen_lwccm ()) { Identifier arg_id ("key"); UTL_ScopedName arg_name (&arg_id, - 0); - AST_Argument *arg = 0; + nullptr); + AST_Argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, pk, @@ -1173,12 +1173,12 @@ be_visitor_ccm_pre_proc::gen_create (be_home *node, arg_id.destroy (); op->be_add_argument (arg); - UTL_ExceptList *tail = 0; + UTL_ExceptList *tail = nullptr; ACE_NEW_RETURN (tail, UTL_ExceptList (this->invalid_key_, - 0), + nullptr), -1); - UTL_ExceptList *middle = 0; + UTL_ExceptList *middle = nullptr; ACE_NEW_RETURN (middle, UTL_ExceptList (this->duplicate_key_value_, tail), @@ -1190,7 +1190,7 @@ be_visitor_ccm_pre_proc::gen_create (be_home *node, op->set_defined_in (implicit); op->set_imported (node->imported ()); - if (0 == implicit->be_add_operation (op)) + if (nullptr == implicit->be_add_operation (op)) { return -1; } @@ -1202,15 +1202,15 @@ int be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node, AST_Interface *implicit) { - UTL_ScopedName *op_name = this->create_scoped_name (0, + UTL_ScopedName *op_name = this->create_scoped_name (nullptr, "find_by_primary_key", - 0, + nullptr, implicit); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (node->managed_component (), AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); @@ -1218,8 +1218,8 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node, AST_Type *pk = node->primary_key (); Identifier arg_id ("key"); UTL_ScopedName arg_name (&arg_id, - 0); - AST_Argument *arg = 0; + nullptr); + AST_Argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, pk, @@ -1228,14 +1228,14 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node, arg_id.destroy (); op->be_add_argument (arg); - UTL_ExceptList *tail = 0; - UTL_ExceptList *middle = 0; + UTL_ExceptList *tail = nullptr; + UTL_ExceptList *middle = nullptr; if (!be_global->gen_lwccm ()) { ACE_NEW_RETURN (tail, UTL_ExceptList (this->invalid_key_, - 0), + nullptr), -1); ACE_NEW_RETURN (middle, UTL_ExceptList (this->unknown_key_value_, @@ -1243,7 +1243,7 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node, -1); } - UTL_ExceptList *exceps = 0; + UTL_ExceptList *exceps = nullptr; ACE_NEW_RETURN (exceps, UTL_ExceptList (this->finder_failure_, middle), @@ -1252,7 +1252,7 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node, op->set_defined_in (implicit); op->set_imported (node->imported ()); - if (0 == implicit->be_add_operation (op)) + if (nullptr == implicit->be_add_operation (op)) { return -1; } @@ -1264,15 +1264,15 @@ int be_visitor_ccm_pre_proc::gen_remove (be_home *node, AST_Interface *implicit) { - UTL_ScopedName *op_name = this->create_scoped_name (0, + UTL_ScopedName *op_name = this->create_scoped_name (nullptr, "remove", - 0, + nullptr, implicit); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (be_global->void_type (), AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); @@ -1280,8 +1280,8 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node, AST_Type *pk = node->primary_key (); Identifier arg_id ("key"); UTL_ScopedName arg_name (&arg_id, - 0); - AST_Argument *arg = 0; + nullptr); + AST_Argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, pk, @@ -1290,14 +1290,14 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node, arg_id.destroy (); op->be_add_argument (arg); - UTL_ExceptList *tail = 0; - UTL_ExceptList *middle = 0; + UTL_ExceptList *tail = nullptr; + UTL_ExceptList *middle = nullptr; if (!be_global->gen_lwccm ()) { ACE_NEW_RETURN (tail, UTL_ExceptList (this->invalid_key_, - 0), + nullptr), -1); ACE_NEW_RETURN (middle, UTL_ExceptList (this->unknown_key_value_, @@ -1305,7 +1305,7 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node, -1); } - UTL_ExceptList *exceps = 0; + UTL_ExceptList *exceps = nullptr; ACE_NEW_RETURN (exceps, UTL_ExceptList (this->remove_failure_, middle), @@ -1314,7 +1314,7 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node, op->set_defined_in (implicit); op->set_imported (node->imported ()); - if (0 == implicit->be_add_operation (op)) + if (nullptr == implicit->be_add_operation (op)) { return -1; } @@ -1326,23 +1326,23 @@ int be_visitor_ccm_pre_proc::gen_get_primary_key (be_home *node, AST_Interface *implicit) { - UTL_ScopedName *op_name = this->create_scoped_name (0, + UTL_ScopedName *op_name = this->create_scoped_name (nullptr, "get_primary_key", - 0, + nullptr, implicit); - be_operation *op = 0; + be_operation *op = nullptr; ACE_NEW_RETURN (op, be_operation (node->primary_key (), AST_Operation::OP_noflags, - 0, + nullptr, 0, 0), -1); op->set_name (op_name); Identifier arg_id ("comp"); UTL_ScopedName arg_name (&arg_id, - 0); - AST_Argument *arg = 0; + nullptr); + AST_Argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_IN, node->managed_component (), @@ -1353,7 +1353,7 @@ be_visitor_ccm_pre_proc::gen_get_primary_key (be_home *node, op->set_defined_in (implicit); op->set_imported (node->imported ()); - if (0 == implicit->be_add_operation (op)) + if (nullptr == implicit->be_add_operation (op)) { return -1; } @@ -1379,11 +1379,11 @@ be_visitor_ccm_pre_proc::gen_extended_port (be_porttype *pt) int be_visitor_ccm_pre_proc::lookup_cookie (void) { - if (this->cookie_ == 0) + if (this->cookie_ == nullptr) { Identifier local_id ("Cookie"); UTL_ScopedName local_name (&local_id, - 0); + nullptr); UTL_ScopedName cookie_name (&this->module_id_, &local_name); AST_Decl *d = @@ -1391,7 +1391,7 @@ be_visitor_ccm_pre_proc::lookup_cookie (void) true); local_id.destroy (); - if (d == 0) + if (d == nullptr) { idl_global->err ()->lookup_error (&cookie_name); return -1; @@ -1399,7 +1399,7 @@ be_visitor_ccm_pre_proc::lookup_cookie (void) this->cookie_ = dynamic_cast<be_valuetype*> (d); - if (this->cookie_ == 0) + if (this->cookie_ == nullptr) { idl_global->err ()->valuetype_expected (d); return -1; @@ -1460,7 +1460,7 @@ be_visitor_ccm_pre_proc::lookup_one_exception (const char *name, { Identifier id (name); UTL_ScopedName local_name (&id, - 0); + nullptr); UTL_ScopedName scoped_name (&this->module_id_, &local_name); AST_Decl *d = @@ -1468,7 +1468,7 @@ be_visitor_ccm_pre_proc::lookup_one_exception (const char *name, true); id.destroy (); - if (d == 0) + if (d == nullptr) { idl_global->err ()->lookup_error (&scoped_name); return -1; @@ -1476,7 +1476,7 @@ be_visitor_ccm_pre_proc::lookup_one_exception (const char *name, result = dynamic_cast<be_exception*> (d); - if (result == 0) + if (result == nullptr) { return -1; } @@ -1491,7 +1491,7 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node) UTL_Scope *s = node->defined_in (); UTL_ScopedName *consumer_name = - this->create_scoped_name (0, + this->create_scoped_name (nullptr, node->local_name (), "Consumer", ScopeAsDecl (node->defined_in ())); @@ -1500,12 +1500,12 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node) /// declared eventtypes. Since forward declarations can /// appear any number of times, we need to check that this /// event consumer hasn't already been created. - if (s->lookup_by_name (consumer_name, true) != 0) + if (s->lookup_by_name (consumer_name, true) != nullptr) { return 0; } - AST_Interface *event_consumer = 0; + AST_Interface *event_consumer = nullptr; AST_Module *m = dynamic_cast<AST_Module*> (s); // We're at global scope here so we need to fool the scope stack @@ -1515,11 +1515,11 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node) Identifier parent_id ("EventConsumerBase"); UTL_ScopedName parent_local_name (&parent_id, - 0); + nullptr); UTL_ScopedName parent_full_name (&this->module_id_, &parent_local_name); UTL_NameList parent_list (&parent_full_name, - 0); + nullptr); FE_InterfaceHeader header (consumer_name, &parent_list, false, @@ -1551,7 +1551,7 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node) // necessary in case the eventtype's prefix was modified after // its declaration. We assume 'implied IDL' means that the // derived event consumer interface should have the same prefix. - event_consumer->repoID (0); + event_consumer->repoID (nullptr); event_consumer->prefix (const_cast<char*> (node->prefix ())); dynamic_cast<be_type*> (event_consumer)->gen_fwd_helper_name (); @@ -1571,17 +1571,17 @@ be_visitor_ccm_pre_proc::lookup_consumer (be_field *node) impl->defined_in ()->lookup_by_name_local (&rettype_id, false); rettype_id.destroy (); - if (d == 0) + if (d == nullptr) { - return 0; + return nullptr; } AST_Interface *i = dynamic_cast<AST_Interface*> (d); - if (i == 0) + if (i == nullptr) { idl_global->err ()->interface_expected (d); - return 0; + return nullptr; } return i; @@ -1607,32 +1607,32 @@ be_visitor_ccm_pre_proc::create_explicit (be_home *node) AST_Interface * be_visitor_ccm_pre_proc::create_implicit (be_home *node) { - Identifier *parent_id = 0; + Identifier *parent_id = nullptr; ACE_NEW_RETURN (parent_id, Identifier ("KeylessCCMHome"), - 0); + nullptr); - UTL_ScopedName *parent_local_name = 0; + UTL_ScopedName *parent_local_name = nullptr; ACE_NEW_RETURN (parent_local_name, - UTL_ScopedName (parent_id, 0), - 0); + UTL_ScopedName (parent_id, nullptr), + nullptr); - UTL_ScopedName *parent_full_name = 0; + UTL_ScopedName *parent_full_name = nullptr; ACE_NEW_RETURN (parent_full_name, UTL_ScopedName (this->module_id_.copy (), parent_local_name), - 0); + nullptr); - UTL_NameList parent_list (parent_full_name, 0); + UTL_NameList parent_list (parent_full_name, nullptr); - UTL_NameList *parent_list_ptr = 0; + UTL_NameList *parent_list_ptr = nullptr; - if (node->primary_key () == 0) + if (node->primary_key () == nullptr) { parent_list_ptr = &parent_list; } - FE_InterfaceHeader header (0, + FE_InterfaceHeader header (nullptr, parent_list_ptr, false, false, @@ -1644,12 +1644,12 @@ be_visitor_ccm_pre_proc::create_implicit (be_home *node) idl_global->scopes ().push (node->defined_in ()); UTL_ScopedName *implicit_name = - this->create_scoped_name (0, + this->create_scoped_name (nullptr, node->local_name (), "Implicit", ScopeAsDecl (node->defined_in ())); - be_interface *i = 0; + be_interface *i = nullptr; ACE_NEW_RETURN (i, be_interface (implicit_name, header.inherits (), @@ -1658,7 +1658,7 @@ be_visitor_ccm_pre_proc::create_implicit (be_home *node) header.n_inherits_flat (), false, false), - 0); + nullptr); // Back to reality. idl_global->scopes ().pop (); @@ -1688,15 +1688,15 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node, { UTL_Scope *s = node->defined_in (); UTL_ScopedName *equiv_name = - this->create_scoped_name (0, + this->create_scoped_name (nullptr, node->local_name (), - 0, + nullptr, ScopeAsDecl (s)); UTL_NameList tail (implicit->name (), - 0); + nullptr); UTL_NameList parent_list (xplicit->name (), &tail); - FE_InterfaceHeader header (0, + FE_InterfaceHeader header (nullptr, &parent_list, false, false, @@ -1707,7 +1707,7 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node, // interface construction time. idl_global->scopes ().push (node->defined_in ()); - be_interface *retval = 0; + be_interface *retval = nullptr; ACE_NEW_RETURN (retval, be_interface (equiv_name, header.inherits (), @@ -1716,7 +1716,7 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node, header.n_inherits_flat (), false, false), - 0); + nullptr); // Back to reality. idl_global->scopes ().pop (); @@ -1733,7 +1733,7 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node, UTL_ScopedName *unmangled_name = static_cast<UTL_ScopedName *> (node->name ()->copy ()); UTL_ScopedName *mangled_name = - this->create_scoped_name (0, + this->create_scoped_name (nullptr, node->local_name (), "_tao_home_name_extension", ScopeAsDecl (s)); @@ -1755,19 +1755,19 @@ be_visitor_ccm_pre_proc::create_scoped_name (const char *prefix, AST_Decl *parent) { ACE_CString local_string (prefix, - 0, + nullptr, false); local_string += local_name; local_string += suffix; - Identifier *local_id = 0; + Identifier *local_id = nullptr; ACE_NEW_RETURN (local_id, Identifier (local_string.fast_rep ()), - 0); - UTL_ScopedName *last_segment = 0; + nullptr); + UTL_ScopedName *last_segment = nullptr; ACE_NEW_RETURN (last_segment, UTL_ScopedName (local_id, - 0), - 0); + nullptr), + nullptr); UTL_ScopedName *full_name = static_cast<UTL_ScopedName *> (parent->name ()->copy ()); full_name->nconc (last_segment); @@ -1777,28 +1777,28 @@ be_visitor_ccm_pre_proc::create_scoped_name (const char *prefix, UTL_NameList * be_visitor_ccm_pre_proc::compute_inheritance (be_home *node) { - UTL_NameList *retval = 0; + UTL_NameList *retval = nullptr; - if (node->base_home () == 0) + if (node->base_home () == nullptr) { - Identifier *local_id = 0; + Identifier *local_id = nullptr; ACE_NEW_RETURN (local_id, Identifier ("CCMHome"), - 0); - UTL_ScopedName *local_name = 0; + nullptr); + UTL_ScopedName *local_name = nullptr; ACE_NEW_RETURN (local_name, UTL_ScopedName (local_id, - 0), - 0); - UTL_ScopedName *full_name = 0; + nullptr), + nullptr); + UTL_ScopedName *full_name = nullptr; ACE_NEW_RETURN (full_name, UTL_ScopedName (this->module_id_.copy (), local_name), - 0); + nullptr); ACE_NEW_RETURN (retval, UTL_NameList (full_name, - 0), - 0); + nullptr), + nullptr); } else @@ -1812,13 +1812,13 @@ be_visitor_ccm_pre_proc::compute_inheritance (be_home *node) parent_name->last_component ()->replace_string (new_local.c_str ()); ACE_NEW_RETURN (retval, UTL_NameList (parent_name, - 0), - 0); + nullptr), + nullptr); } long n_supports = node->n_inherits (); - UTL_ScopedName *supported_name = 0; - UTL_NameList *conc_value = 0; + UTL_ScopedName *supported_name = nullptr; + UTL_NameList *conc_value = nullptr; for (long i = 0; i < n_supports; ++i) { @@ -1826,8 +1826,8 @@ be_visitor_ccm_pre_proc::compute_inheritance (be_home *node) static_cast<UTL_ScopedName *> (node->inherits ()[i]->name ()->copy ()); ACE_NEW_RETURN (conc_value, UTL_NameList (supported_name, - 0), - 0); + nullptr), + nullptr); retval->nconc (conc_value); } @@ -1857,7 +1857,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void) ! i.done (); i.advance ()) { - char **item = 0; + char **item = nullptr; i.next (item); UTL_ScopedName *sn = @@ -1868,24 +1868,24 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void) AST_Decl *d = s->lookup_by_name (sn, true); - if (d == 0) + if (d == nullptr) { idl_global->err ()->lookup_error (sn); sn->destroy (); delete sn; - sn = 0; + sn = nullptr; continue; } sn->destroy (); delete sn; - sn = 0; + sn = nullptr; be_uses *u = dynamic_cast<be_uses*> (d); - if (u == 0) + if (u == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ccm_pre_proc") @@ -1906,21 +1906,21 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void) be_interface *ami_iface = dynamic_cast<be_interface*> (iface->ami4ccm_uses ()); - if (ami_iface == 0) + if (ami_iface == nullptr) { ACE_CString iname ("AMI4CCM_"); iname += iface->local_name (); Identifier itmp_id (iname.c_str ()); - UTL_ScopedName itmp_sn (&itmp_id, 0); + UTL_ScopedName itmp_sn (&itmp_id, nullptr); s = iface->defined_in (); idl_global->scopes ().push (s); ACE_NEW_RETURN (ami_iface, be_interface (&itmp_sn, + nullptr, 0, - 0, - 0, + nullptr, 0, true, false), @@ -1945,11 +1945,11 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void) ACE_CString uname ("sendc_"); uname += u->local_name ()->get_string (); Identifier utmp_id (uname.c_str ()); - UTL_ScopedName utmp_sn (&utmp_id, 0); + UTL_ScopedName utmp_sn (&utmp_id, nullptr); s = u->defined_in (); idl_global->scopes ().push (s); - be_uses *ami_uses = 0; + be_uses *ami_uses = nullptr; ACE_NEW_RETURN (ami_uses, be_uses (&utmp_sn, ami_iface, diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp index 1c19733f9b8..cde1dfd929c 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp @@ -15,8 +15,8 @@ be_visitor_component_ami_rh_ex_base::be_visitor_component_ami_rh_ex_base ( be_visitor_context *ctx) : be_visitor_scope (ctx), - iface_ (0), - port_ (0) + iface_ (nullptr), + port_ (nullptr) { } diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp index ba504ea5f33..2053bcb7ada 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp @@ -120,25 +120,25 @@ be_visitor_component_ami_rh_exh::visit_operation ( if (!vrt) { - Identifier *id = 0; - UTL_ScopedName *sn = 0; + Identifier *id = nullptr; + UTL_ScopedName *sn = nullptr; ACE_NEW_RETURN (id, Identifier ("ami_return_val"), -1); - UTL_ScopedName *tmp = 0; + UTL_ScopedName *tmp = nullptr; ACE_NEW_RETURN (tmp, UTL_ScopedName (id, - 0), + nullptr), -1); sn = (UTL_ScopedName *)node->name ()->copy (); sn->nconc (tmp); // Create the argument. - be_argument *arg = 0; + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_OUT, node->return_type (), diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp index 1618e44d94a..7c09e8db40b 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp @@ -121,25 +121,25 @@ be_visitor_component_ami_rh_exs::visit_operation ( if (!vrt) { - Identifier *id = 0; - UTL_ScopedName *sn = 0; + Identifier *id = nullptr; + UTL_ScopedName *sn = nullptr; ACE_NEW_RETURN (id, Identifier ("ami_return_val"), -1); - UTL_ScopedName *tmp = 0; + UTL_ScopedName *tmp = nullptr; ACE_NEW_RETURN (tmp, UTL_ScopedName (id, - 0), + nullptr), -1); sn = (UTL_ScopedName *)node->name ()->copy (); sn->nconc (tmp); // Create the argument. - be_argument *arg = 0; + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (AST_Argument::dir_OUT, node->return_type (), diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp index 981748a1c9c..f5276e2a3a7 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp @@ -73,7 +73,7 @@ be_visitor_component_exh::visit_component (be_component *node) ! i.done (); i.advance ()) { - char **item = 0; + char **item = nullptr; i.next (item); UTL_ScopedName *sn = @@ -84,24 +84,24 @@ be_visitor_component_exh::visit_component (be_component *node) AST_Decl *d = s->lookup_by_name (sn, true); - if (d == 0) + if (d == nullptr) { idl_global->err ()->lookup_error (sn); sn->destroy (); delete sn; - sn = 0; + sn = nullptr; continue; } sn->destroy (); delete sn; - sn = 0; + sn = nullptr; be_uses *u = dynamic_cast<be_uses*> (d); - if (u == 0) + if (u == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_component_exh") diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp index c01a63cfe06..e97c6f33018 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp @@ -74,7 +74,7 @@ be_visitor_component_exs::visit_component (be_component *node) ! i.done (); i.advance ()) { - char **item = 0; + char **item = nullptr; i.next (item); UTL_ScopedName *sn = @@ -85,24 +85,24 @@ be_visitor_component_exs::visit_component (be_component *node) AST_Decl *d = s->lookup_by_name (sn, true); - if (d == 0) + if (d == nullptr) { idl_global->err ()->lookup_error (sn); sn->destroy (); delete sn; - sn = 0; + sn = nullptr; continue; } sn->destroy (); delete sn; - sn = 0; + sn = nullptr; be_uses *u = dynamic_cast<be_uses*> (d); - if (u == 0) + if (u == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_component_exs") diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp index 3a6be29fa1f..7d9f4fc1884 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp @@ -36,7 +36,7 @@ be_visitor_context_ex_idl::visit_component (be_component *node) AST_Component *base = node->base_component (); - if (base == 0) + if (base == nullptr) { os_ << "::Components::" << be_global->ciao_container_type () << "Context"; diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp index 18701bbb2cb..92351e92038 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp @@ -37,7 +37,7 @@ be_visitor_executor_ex_idl::visit_component ( << be_idt_nl << ": "; - if (base == 0) + if (base == nullptr) { os_ << "::Components::EnterpriseComponent"; } @@ -226,7 +226,7 @@ be_visitor_executor_ex_idl::gen_exception_list ( const char *prefix, bool closed) { - if (exceptions != 0 && exceptions->length () > 0) + if (exceptions != nullptr && exceptions->length () > 0) { os_ << be_idt_nl << prefix << "raises ( "; diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp index 23525462dd7..22b717729f5 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp @@ -14,7 +14,7 @@ be_visitor_executor_exs::be_visitor_executor_exs ( be_visitor_context *ctx) : be_visitor_component_scope (ctx), - op_scope_ (0), + op_scope_ (nullptr), comment_start_border_ ("/**"), comment_end_border_ (" */"), your_code_here_ ("/* Your code here. */") diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp index 5b1abe4c53b..6d2b32ccfe4 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp @@ -14,7 +14,7 @@ be_visitor_facet_exs::be_visitor_facet_exs ( be_visitor_context *ctx) : be_visitor_component_scope (ctx), - op_scope_ (0), + op_scope_ (nullptr), comment_start_border_ ("/**"), comment_end_border_ (" */") { diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp index eb710e03ba9..b0078cfcab7 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp @@ -291,7 +291,7 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node) ACE_CString holder (obj_name); ACE_CString::size_type pos = holder.rfind (':'); - const char *ev_lname = 0; + const char *ev_lname = nullptr; if (pos == ACE_CString::npos) { diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp index bf1420b8c4f..b9c9202f623 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp @@ -13,7 +13,7 @@ be_visitor_servant_svs::be_visitor_servant_svs (be_visitor_context *ctx) : be_visitor_component_scope (ctx), - op_scope_ (0) + op_scope_ (nullptr) { } @@ -1112,7 +1112,7 @@ be_visitor_attr_set::visit_attribute (be_attribute *node) int be_visitor_attr_set::visit_component_scope (be_component *node) { - if (node == 0) + if (node == nullptr) { return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp index 2dd90e0b89f..b2f97c37c00 100644 --- a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp @@ -26,7 +26,7 @@ be_visitor_component_scope::be_visitor_component_scope ( be_visitor_context *ctx) : be_visitor_scope (ctx), - node_ (0), + node_ (nullptr), os_ (*ctx->stream ()), export_macro_ (be_global->svnt_export_macro ()), in_ext_port_ (false) @@ -119,7 +119,7 @@ int be_visitor_component_scope::visit_component_scope ( be_component *node) { - if (node == 0) + if (node == nullptr) { return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp index d51ec479dd2..1c2bd8c1cca 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp @@ -26,10 +26,10 @@ be_visitor_connector_dds_ex_base::be_visitor_connector_dds_ex_base ( be_visitor_context *ctx) : be_visitor_component_scope (ctx), - t_inst_ (0), - t_ref_ (0), - t_params_ (0), - base_tname_ (0) + t_inst_ (nullptr), + t_ref_ (nullptr), + t_params_ (nullptr), + base_tname_ (nullptr) { } @@ -47,7 +47,7 @@ be_visitor_connector_dds_ex_base::begin (be_connector *node) AST_Connector *base = node; - while (this->t_args_.is_empty () && base != 0) + while (this->t_args_.is_empty () && base != nullptr) { this->process_template_args (base); base = base->base_connector (); @@ -78,7 +78,7 @@ be_visitor_connector_dds_ex_base::is_dds_type ( if (base) { - while (base->base_connector () != 0) + while (base->base_connector () != nullptr) { base = base->base_connector (); } @@ -89,11 +89,11 @@ be_visitor_connector_dds_ex_base::is_dds_type ( { AST_Structure *s = dynamic_cast<AST_Structure*> (d); - if (s == 0) + if (s == nullptr) { AST_Typedef *td = dynamic_cast<AST_Typedef*> (d); - if (td != 0) + if (td != nullptr) { s = dynamic_cast<AST_Structure*> (td->primitive_base_type ()); } @@ -126,13 +126,13 @@ be_visitor_connector_dds_ex_base::process_template_args ( /// We assume the connector comes from the instantiation /// of a template module, and the regular module it's /// defined in (at some level) will have a reference to it. - while (this->t_inst_ == 0 && m != 0) + while (this->t_inst_ == nullptr && m != nullptr) { this->t_inst_ = m->from_inst (); m = dynamic_cast<AST_Module*> (m->defined_in ()); } - if (this->t_inst_ == 0) + if (this->t_inst_ == nullptr) { /// Probably means we're trying the base connector /// of DDS_State or DDS_Event, in which case we @@ -154,7 +154,7 @@ be_visitor_connector_dds_ex_base::process_template_args ( /// We depend on the DDS datatype being the first template /// argument for now, this may change. - AST_Decl **datatype = 0; + AST_Decl **datatype = nullptr; int const status = this->t_args_.get (datatype, 0UL); if (status != 0) @@ -179,7 +179,7 @@ be_visitor_connector_dds_ex_base::match_template_args (void) /// only the args referenced in the alias (see FOR loop /// below). Otherwise, we just copy the containing template /// module instantiation's arg list. - if (this->t_ref_ == 0) + if (this->t_ref_ == nullptr) { this->t_args_ = *this->t_inst_->template_args (); return; @@ -197,12 +197,12 @@ be_visitor_connector_dds_ex_base::match_template_args (void) ! ci.done (); ci.advance (), ++slot) { - FE_Utils::T_Param_Info *t_param = 0; + FE_Utils::T_Param_Info *t_param = nullptr; ci.next (t_param); if (t_param->name_ == ref_name) { - AST_Decl **d = 0; + AST_Decl **d = nullptr; this->t_inst_->template_args ()->get (d, slot); this->t_args_.enqueue_tail (*d); break; diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp index 2437fd24809..1feb98aa731 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp @@ -58,7 +58,7 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) !i.done (); i.advance ()) { - AST_Decl **item = 0; + AST_Decl **item = nullptr; i.next (item); AST_Decl *d = *item; @@ -87,7 +87,7 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) !i.done (); i.advance (), ++slot) { - AST_Decl **item = 0; + AST_Decl **item = nullptr; i.next (item); AST_Decl *d = *item; @@ -103,7 +103,7 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) bool needs_bool = false; bool is_fixed = false; - FE_Utils::T_Param_Info *param = 0; + FE_Utils::T_Param_Info *param = nullptr; if (this->t_params_->get (param, slot - 1) != 0) { @@ -175,7 +175,7 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) !iter.done (); iter.advance ()) { - be_interface **item = 0; + be_interface **item = nullptr; iter.next (item); (*item)->dds_connector_traits_done (false); @@ -218,7 +218,7 @@ be_visitor_connector_dds_exh::visit_mirror_port ( !iter.done (); iter.advance ()) { - be_interface **item = 0; + be_interface **item = nullptr; iter.next (item); (*item)->dds_connector_traits_done (false); diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp index 11f787f370f..4d951143a82 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp @@ -61,7 +61,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) !i.done (); i.advance (), ++slot) { - AST_Decl **item = 0; + AST_Decl **item = nullptr; i.next (item); AST_Decl *d = *item; @@ -77,7 +77,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) bool needs_bool = false; bool is_fixed = false; - FE_Utils::T_Param_Info *param = 0; + FE_Utils::T_Param_Info *param = nullptr; if (this->t_params_->get (param, slot - 1) != 0) { diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp index 6cc3e71c274..8d6cffd5063 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp @@ -51,7 +51,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) AST_Decl *d = i.item (); AST_Provides *p = dynamic_cast<AST_Provides*> (d); - if (p != 0) + if (p != nullptr) { if (first) { diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp index 0651e27403d..15d97e0fda8 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp @@ -17,10 +17,10 @@ be_visitor_facet_ami_exh::be_visitor_facet_ami_exh ( be_visitor_context *ctx) : be_visitor_component_scope (ctx), - iface_ (0), - callback_iface_ (0), - scope_name_ (0), - iface_name_ (0), + iface_ (nullptr), + callback_iface_ (nullptr), + scope_name_ (nullptr), + iface_name_ (nullptr), sync_ (false) { // This is initialized in the base class to svnt_export_macro() @@ -103,7 +103,7 @@ be_visitor_facet_ami_exh::visit_attribute (be_attribute *node) return 0; } Identifier id ("void"); - UTL_ScopedName sn (&id, 0); + UTL_ScopedName sn (&id, nullptr); // Create the return type, which is "void" be_predefined_type rt (AST_PredefinedType::PT_void, &sn); @@ -208,12 +208,12 @@ be_visitor_facet_ami_exh::init (bool for_impl) AST_Decl *d = s->lookup_by_name (sn, true, false); this->callback_iface_ = dynamic_cast<be_interface*> (d); - if (this->callback_iface_ == 0) + if (this->callback_iface_ == nullptr) this->sync_ = true; sn->destroy (); delete sn; - sn = 0; + sn = nullptr; } int @@ -299,7 +299,7 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void) handler_str += "::"; handler_str += tmp; - if (ACE_OS::strstr (tmp.c_str(), "AMI4CCM") != 0) + if (ACE_OS::strstr (tmp.c_str(), "AMI4CCM") != nullptr) this->sync_ = false; else this->sync_ = true; @@ -312,7 +312,7 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void) sn->destroy (); delete sn; - sn = 0; + sn = nullptr; be_interface *sync_iface = dynamic_cast<be_interface*> (d); diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp index b7a17e47f4e..9ed9c136c91 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp @@ -94,7 +94,7 @@ be_visitor_facet_ami_exs::visit_attribute (be_attribute *node) return 0; } Identifier id ("void"); - UTL_ScopedName sn (&id, 0); + UTL_ScopedName sn (&id, nullptr); // Create the return type, which is "void" be_predefined_type rt (AST_PredefinedType::PT_void, &sn); @@ -219,13 +219,13 @@ be_visitor_facet_ami_exs::init (void) sn->destroy (); delete sn; - sn = 0; + sn = nullptr; be_interface *callback_iface = dynamic_cast<be_interface*> (d); - if (callback_iface == 0) + if (callback_iface == nullptr) this->sync_ = true; else this->sync_ = false; @@ -291,7 +291,7 @@ be_visitor_facet_ami_exs::gen_reply_handler_class (void) sn->destroy (); delete sn; - sn = 0; + sn = nullptr; be_interface *callback_iface = @@ -360,7 +360,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void) sn->destroy (); delete sn; - sn = 0; + sn = nullptr; be_interface *sync_iface = dynamic_cast<be_interface*> (d); @@ -389,7 +389,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void) } - ACE_CString scope_str (scope_name, 0, false); + ACE_CString scope_str (scope_name, nullptr, false); const char *container_type = be_global->ciao_container_type (); @@ -539,7 +539,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node) { // do not handle not sendc operations. - if (ACE_OS::strstr (node->local_name()->get_string (), "sendc_")== 0) + if (ACE_OS::strstr (node->local_name()->get_string (), "sendc_")== nullptr) return 0; os_ << be_nl_2 @@ -701,10 +701,10 @@ be_visitor_facet_ami_exs::gen_facet_executor_sync_op (be_operation *node) os_ << be_nl << "{" << be_idt_nl; - AST_PredefinedType *pdt = 0; + AST_PredefinedType *pdt = nullptr; pdt = dynamic_cast<AST_PredefinedType*> (bt); bool ret = true; - if ((pdt != 0) && (pdt->pt () == AST_PredefinedType::PT_void)) + if ((pdt != nullptr) && (pdt->pt () == AST_PredefinedType::PT_void)) ret =false; os_ << "::" << scope->full_name () << smart_scope diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp index 7f682732403..99ab89df866 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp @@ -43,7 +43,7 @@ be_visitor_constant_ch::visit_constant (be_constant *node) AST_Expression::ExprType etype = node->et (); AST_Decl::NodeType snt = node->defined_in ()->scope_node_type (); - if (tdef != 0) + if (tdef != nullptr) { nt = tdef->node_type (); be_typedef *td = dynamic_cast<be_typedef*> (tdef); diff --git a/TAO/TAO_IDL/be/be_visitor_context.cpp b/TAO/TAO_IDL/be/be_visitor_context.cpp index 358281ed669..0c428f4faff 100644 --- a/TAO/TAO_IDL/be/be_visitor_context.cpp +++ b/TAO/TAO_IDL/be/be_visitor_context.cpp @@ -17,15 +17,15 @@ be_visitor_context::be_visitor_context (void) : ast_visitor_context (), state_ (TAO_CodeGen::TAO_INITIAL), sub_state_ (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN), - os_ (0), - scope_ (0), - node_ (0), - alias_ (0), - tdef_ (0), - attr_ (0), + os_ (nullptr), + scope_ (nullptr), + node_ (nullptr), + alias_ (nullptr), + tdef_ (nullptr), + attr_ (nullptr), exception_ (0), comma_ (0), - interface_ (0) + interface_ (nullptr) { } @@ -79,17 +79,17 @@ be_visitor_context::reset (void) { this->state_ = TAO_CodeGen::TAO_INITIAL; this->sub_state_ = TAO_CodeGen::TAO_SUB_STATE_UNKNOWN; - this->os_ = 0; - this->scope_ = 0; - this->node_ = 0; - this->alias_ = 0; - this->tdef_ = 0; - this->attr_ = 0; + this->os_ = nullptr; + this->scope_ = nullptr; + this->node_ = nullptr; + this->alias_ = nullptr; + this->tdef_ = nullptr; + this->attr_ = nullptr; this->exception_ = 0; this->comma_ = 0; - this->interface_ = 0; - this->template_args_ = 0; - this->template_params_ = 0; + this->interface_ = nullptr; + this->template_args_ = nullptr; + this->template_params_ = nullptr; this->port_prefix_ = ""; } diff --git a/TAO/TAO_IDL/be/be_visitor_dds_ts_idl.cpp b/TAO/TAO_IDL/be/be_visitor_dds_ts_idl.cpp index f7374989670..86723926996 100644 --- a/TAO/TAO_IDL/be/be_visitor_dds_ts_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_dds_ts_idl.cpp @@ -28,7 +28,7 @@ be_visitor_dds_ts_idl::be_visitor_dds_ts_idl ( be_visitor_context *ctx) : be_visitor_scope (ctx), - os_ptr_ (0) + os_ptr_ (nullptr) { } @@ -365,5 +365,5 @@ be_visitor_dds_ts_idl::fini_file (void) << "\n"; delete this->os_ptr_; - this->os_ptr_ = 0; + this->os_ptr_ = nullptr; } diff --git a/TAO/TAO_IDL/be/be_visitor_decl.cpp b/TAO/TAO_IDL/be/be_visitor_decl.cpp index 5d3b2f24af9..7fb096e9108 100644 --- a/TAO/TAO_IDL/be/be_visitor_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_decl.cpp @@ -45,7 +45,7 @@ be_visitor_decl::gen_anonymous_base_type (be_type *bt, ctx.state (cg_state); // In case our container was typedef'd. - ctx.tdef (0); + ctx.tdef (nullptr); int status = 0; diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp index 7bae6e9a7f1..5d65cb0f50c 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp @@ -35,7 +35,7 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node) *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested ()) { @@ -56,7 +56,7 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node) } } - if (module != 0) + if (module != nullptr) { // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. @@ -90,7 +90,7 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp index c8f9a89a2ea..8d19bc0da75 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp @@ -68,7 +68,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) *os << be_global->core_versioning_end () << be_nl; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested ()) { AST_Decl *d = node; @@ -88,7 +88,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) } } - if (module != 0) + if (module != nullptr) { // Some compilers handle "any" operators in a namespace corresponding // to their module, others do not. @@ -166,7 +166,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp index 735c673ff54..d27d97322e2 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp @@ -36,7 +36,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node) *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested ()) { AST_Decl *d = node; @@ -56,7 +56,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node) } } - if (module != 0) + if (module != nullptr) { // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. @@ -92,7 +92,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp index 088ef2615bb..7a844ffa0ae 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp @@ -103,7 +103,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) *os << be_global->core_versioning_end () << be_nl; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested ()) { AST_Decl *d = node; @@ -123,7 +123,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) } } - if (module != 0) + if (module != nullptr) { // Some compilers handle "any" operators in a namespace corresponding // to their module, others do not. @@ -244,7 +244,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp index 824b682934c..7d4786f5374 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp @@ -394,7 +394,7 @@ be_visitor_exception_ctor_assign::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); 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 dcee5ccd560..e6cfc01e1c7 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp @@ -119,7 +119,7 @@ int be_visitor_exception_ctor::visit_array (be_array *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -154,7 +154,7 @@ int be_visitor_exception_ctor::visit_enum (be_enum *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -181,7 +181,7 @@ int be_visitor_exception_ctor::visit_interface (be_interface *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -208,7 +208,7 @@ int be_visitor_exception_ctor::visit_interface_fwd (be_interface_fwd *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -253,10 +253,10 @@ int be_visitor_exception_ctor::visit_predefined_type (be_predefined_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; be_typedef *td = this->ctx_->alias (); - if (td != 0) + if (td != nullptr) { bt = td; } @@ -315,7 +315,7 @@ int be_visitor_exception_ctor::visit_sequence (be_sequence *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -361,7 +361,7 @@ int be_visitor_exception_ctor::visit_structure (be_structure *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -400,7 +400,7 @@ int be_visitor_exception_ctor::visit_union (be_union *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -448,7 +448,7 @@ be_visitor_exception_ctor::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -456,7 +456,7 @@ int be_visitor_exception_ctor::emit_common (be_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp index 95770253aea..ae2fea80759 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp @@ -207,7 +207,7 @@ be_visitor_field_cdr_op_ch::visit_typedef (be_typedef *node) ), -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp index 751a5c1ddc9..9f7c79b6cea 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp @@ -83,7 +83,7 @@ be_visitor_field_cdr_op_cs::visit_array (be_array *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_cs::" @@ -102,7 +102,7 @@ be_visitor_field_cdr_op_cs::visit_array (be_array *node) '\0', NAMEBUFSIZE); - if (this->ctx_->alias () == 0 // Not a typedef. + if (this->ctx_->alias () == nullptr // Not a typedef. && node->is_child (this->ctx_->scope ()->decl ())) { // For anonymous arrays ... @@ -190,7 +190,7 @@ be_visitor_field_cdr_op_cs::visit_enum (be_enum *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_cs::" @@ -233,7 +233,7 @@ be_visitor_field_cdr_op_cs::visit_interface (be_interface *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_cs::" @@ -307,7 +307,7 @@ be_visitor_field_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_cs::" @@ -410,7 +410,7 @@ be_visitor_field_cdr_op_cs::emit_valuetype_common (void) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_cs::" @@ -458,7 +458,7 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_cs::" @@ -581,7 +581,7 @@ be_visitor_field_cdr_op_cs::visit_sequence (be_sequence *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_cs::" @@ -626,7 +626,7 @@ be_visitor_field_cdr_op_cs::visit_string (be_string *str) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_cs::" @@ -640,7 +640,7 @@ be_visitor_field_cdr_op_cs::visit_string (be_string *str) switch (this->ctx_->sub_state ()) { case TAO_CodeGen::TAO_CDR_INPUT: - if (str != 0 && str->max_size ()->ev ()->u.ulval != 0) + if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0) { if (str->width () == (long) sizeof (char)) { @@ -662,7 +662,7 @@ be_visitor_field_cdr_op_cs::visit_string (be_string *str) break; case TAO_CodeGen::TAO_CDR_OUTPUT: - if (str != 0 && str->max_size ()->ev ()->u.ulval != 0) + if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0) { if (str->width () == (long) sizeof (char)) { @@ -728,7 +728,7 @@ be_visitor_field_cdr_op_cs::visit_structure (be_structure *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_cs::" @@ -789,7 +789,7 @@ be_visitor_field_cdr_op_cs::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -823,7 +823,7 @@ be_visitor_field_cdr_op_cs::visit_union (be_union *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_cs::" @@ -889,7 +889,7 @@ be_visitor_cdr_op_field_decl::visit_field (be_field *node) { be_type *bt = dynamic_cast<be_type*> (node->field_type ()); - if (bt == 0) + if (bt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_cdr_op_field_decl::" @@ -922,7 +922,7 @@ be_visitor_cdr_op_field_decl::visit_array (be_array *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_cdr_op_field_decl::" @@ -939,7 +939,7 @@ be_visitor_cdr_op_field_decl::visit_array (be_array *node) '\0', NAMEBUFSIZE); - if (this->ctx_->alias () == 0 // Not a typedef. + if (this->ctx_->alias () == nullptr // Not a typedef. && node->is_child (this->ctx_->scope ()->decl ())) { // For anonymous arrays, @@ -1005,7 +1005,7 @@ be_visitor_cdr_op_field_decl::visit_typedef (be_typedef *node) // The node to be visited in the base primitve type that gets typedefed. be_type *bt = node->primitive_base_type (); - if (bt == 0 || bt->accept (this) == -1) + if (bt == nullptr || bt->accept (this) == -1) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_cdr_op_field_decl::" @@ -1014,6 +1014,6 @@ be_visitor_cdr_op_field_decl::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp index c70562afcc6..1d67e4ac801 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp @@ -67,7 +67,7 @@ int be_visitor_field_ch::visit_array (be_array *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -137,7 +137,7 @@ int be_visitor_field_ch::visit_enum (be_enum *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -226,7 +226,7 @@ int be_visitor_field_ch::emit_common (be_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -261,10 +261,10 @@ int be_visitor_field_ch::visit_predefined_type (be_predefined_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; be_typedef *td = this->ctx_->alias (); - if (td != 0) + if (td != nullptr) { bt = td; } @@ -296,7 +296,7 @@ int be_visitor_field_ch::visit_sequence (be_sequence *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -402,7 +402,7 @@ int be_visitor_field_ch::visit_structure (be_structure *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -479,7 +479,7 @@ be_visitor_field_ch::visit_typedef (be_typedef *node) } // Reset the alias. - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -487,7 +487,7 @@ int be_visitor_field_ch::visit_union (be_union *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp index 5f00fc3b481..d5aa07a82cd 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp @@ -131,7 +131,7 @@ be_visitor_field_ci::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp index 6c9a95ffc55..0ffdeca8b05 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp @@ -174,7 +174,7 @@ be_visitor_field_cs::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp index 896e24430af..a02b816d9f7 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp @@ -14,7 +14,7 @@ be_visitor_home_ex_idl::be_visitor_home_ex_idl ( be_visitor_context *ctx) : be_visitor_scope (ctx), - node_ (0), + node_ (nullptr), os_ (*ctx->stream ()) { } @@ -234,7 +234,7 @@ be_visitor_home_ex_idl::gen_explicit (void) AST_Home *base = node_->base_home (); - if (base == 0) + if (base == nullptr) { os_ << "::Components::HomeExecutorBase"; @@ -309,7 +309,7 @@ be_visitor_home_ex_idl::gen_exception_list ( { ACE_CDR::Long cutoff = (init_op ? 1 : 0); - if (exceptions != 0 && exceptions->length () > cutoff) + if (exceptions != nullptr && exceptions->length () > cutoff) { os_ << be_idt_nl << prefix << "raises ( "; @@ -389,7 +389,7 @@ be_visitor_home_ex_idl::restore_scope (void) UTL_ScopedName *nconc_name = new UTL_ScopedName (d->local_name ()->copy (), - 0); + nullptr); UTL_ScopedName *new_name = dynamic_cast<UTL_ScopedName *> (node_->name ()->copy ()); diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp index 0476d0dcec0..01bcd04ab3a 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp @@ -13,8 +13,8 @@ be_visitor_home_exh::be_visitor_home_exh (be_visitor_context *ctx) : be_visitor_scope (ctx), - node_ (0), - comp_ (0), + node_ (nullptr), + comp_ (nullptr), os_ (*ctx->stream ()), export_macro_ (be_global->exec_export_macro ()) { @@ -127,7 +127,7 @@ be_visitor_home_exh::gen_exec_class (void) be_home *h = node_; - while (h != 0) + while (h != nullptr) { if (this->visit_scope (h) != 0) { diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp index 90b2793691e..14bc95eadab 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp @@ -13,8 +13,8 @@ be_visitor_home_exs::be_visitor_home_exs (be_visitor_context *ctx) : be_visitor_scope (ctx), - node_ (0), - comp_ (0), + node_ (nullptr), + comp_ (nullptr), os_ (*ctx->stream ()), comment_start_border_ ("/**"), comment_end_border_ (" */"), @@ -137,7 +137,7 @@ be_visitor_home_exs::gen_exec_class (void) be_home *h = node_; - while (h != 0) + while (h != nullptr) { if (this->visit_scope (h) != 0) { diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp index b72911fba77..7f0ae8f6bdd 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp @@ -13,8 +13,8 @@ be_visitor_home_svh::be_visitor_home_svh (be_visitor_context *ctx) : be_visitor_scope (ctx), - node_ (0), - comp_ (0), + node_ (nullptr), + comp_ (nullptr), os_ (*ctx->stream ()), export_macro_ (be_global->svnt_export_macro ()) { @@ -165,7 +165,7 @@ be_visitor_home_svh::gen_servant_class (void) AST_Type *pk = node_->primary_key (); - if (pk != 0) + if (pk != nullptr) { os_ << be_nl_2 << "// Implicit home primary key operations - not supported."; @@ -199,7 +199,7 @@ AST_Type *pk = node_->primary_key (); be_home *h = node_; - while (h != 0) + while (h != nullptr) { if (this->visit_scope (h) != 0) { diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp index 9f6f2a969bb..8c23f340d0e 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp @@ -13,8 +13,8 @@ be_visitor_home_svs::be_visitor_home_svs (be_visitor_context *ctx) : be_visitor_scope (ctx), - node_ (0), - comp_ (0), + node_ (nullptr), + comp_ (nullptr), os_ (*ctx->stream ()), export_macro_ (be_global->svnt_export_macro ()), for_finder_ (false) @@ -274,7 +274,7 @@ be_visitor_home_svs::gen_servant_class (void) AST_Type *pk = node_->primary_key (); - if (pk != 0) + if (pk != nullptr) { os_ << be_nl_2 << "::" << comp_->name () << "_ptr" << be_nl @@ -329,7 +329,7 @@ be_visitor_home_svs::gen_servant_class (void) be_home *h = node_; - while (h != 0) + while (h != nullptr) { if (this->visit_scope (h) != 0) { @@ -449,7 +449,7 @@ be_visitor_home_attr_set::~be_visitor_home_attr_set (void) int be_visitor_home_attr_set::visit_home (be_home *node) { - if (node == 0) + if (node == nullptr) { return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp index 51de355c8ff..91f670a924c 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -34,7 +34,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) } // Do not generate AMH classes for any sort of implied IDL. - if (node->original_interface () != 0) + if (node->original_interface () != nullptr) { return 0; } @@ -78,7 +78,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) ACE_CString amh_name ("POA_"); // @@ The following code is *NOT* exception-safe. - char *buf = 0; + char *buf = nullptr; be_interface *base = dynamic_cast<be_interface*> (node->inherits ()[i]); base->compute_full_name ("AMH_", "", buf); @@ -226,8 +226,8 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node, return 0; } - Identifier *id = 0; - UTL_ScopedName *sn = 0; + Identifier *id = nullptr; + UTL_ScopedName *sn = nullptr; ACE_NEW_RETURN (id, Identifier ("void"), @@ -235,11 +235,11 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node, ACE_NEW_RETURN (sn, UTL_ScopedName (id, - 0), + nullptr), -1); // Create the return type, which is "void" - be_predefined_type *rt = 0; + be_predefined_type *rt = nullptr; ACE_NEW_RETURN (rt, be_predefined_type (AST_PredefinedType::PT_void, sn), @@ -258,13 +258,13 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node, ACE_NEW_RETURN (sn, UTL_ScopedName (id, - 0), + nullptr), -1); op_name->nconc (sn); // Create the operation - be_operation *operation = 0; + be_operation *operation = nullptr; ACE_NEW_RETURN (operation, be_operation (rt, //node->return_type (), AST_Operation::OP_noflags, @@ -290,7 +290,7 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node, { operation->destroy (); delete operation; - operation = 0; + operation = nullptr; ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_amh_pre_proc::") @@ -307,7 +307,7 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node, original_arg->direction () == AST_Argument::dir_IN) { // Create the argument. - be_argument *arg = 0; + be_argument *arg = nullptr; ACE_NEW_RETURN (arg, be_argument (original_arg->direction (), original_arg->field_type (), @@ -323,7 +323,7 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node, // After having generated the operation we insert it into the // AMH node interface. - if (0 == amh_node->be_add_operation (operation)) + if (nullptr == amh_node->be_add_operation (operation)) { return -1; } @@ -335,27 +335,27 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node, be_interface * be_visitor_amh_interface_sh::create_amh_class (ACE_CString name) { - Identifier *id = 0; + Identifier *id = nullptr; ACE_NEW_RETURN (id, Identifier (name.c_str ()), - 0); + nullptr); - UTL_ScopedName *amh_class_name = 0; + UTL_ScopedName *amh_class_name = nullptr; ACE_NEW_RETURN (amh_class_name, UTL_ScopedName (id, - 0), - 0); + nullptr), + nullptr); - be_interface *amh_class = 0; + be_interface *amh_class = nullptr; ACE_NEW_RETURN (amh_class, be_interface (amh_class_name, // name - 0, // list of inherited + nullptr, // list of inherited 0, // number of inherited - 0, // list of ancestors + nullptr, // list of ancestors 0, // number of ancestors 0, // non-local 0), // non-abstract - 0); + nullptr); amh_class->set_name (amh_class_name); return amh_class; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index 8d014379fb1..f1b62ce461b 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -38,7 +38,7 @@ int be_visitor_amh_interface_ss::visit_interface (be_interface *node) { // Do not generate AMH classes for any sort of implied IDL. - if (node->original_interface () != 0) + if (node->original_interface () != nullptr) { return 0; } @@ -173,7 +173,7 @@ emit (be_interface * /* derived */, ACE_CString amh_name ("POA_"); // @@ The following code is *NOT* exception-safe. - char *buf = 0; + char *buf = nullptr; base->compute_full_name ("AMH_", "", buf); amh_name += buf; // buf was allocated using ACE_OS::strdup, so we must use free instead @@ -219,7 +219,7 @@ TAO_IDL_Copy_Ctor_Worker::emit (be_interface *derived, if (base->is_nested ()) { - be_decl *scope = 0; + be_decl *scope = nullptr; scope = dynamic_cast<be_scope*> (base->defined_in ())->decl (); *os << "POA_" << scope->name () << "::AMH_" @@ -233,7 +233,7 @@ TAO_IDL_Copy_Ctor_Worker::emit (be_interface *derived, ACE_CString amh_name ("POA_"); // @@ The following code is *NOT* exception-safe. - char *buf = 0; + char *buf = nullptr; base->compute_full_name ("AMH_", "", buf); amh_name += buf; // buf was allocated by ACE_OS::strdup, so we need to use free @@ -275,7 +275,7 @@ ACE_CString be_visitor_amh_interface_ss::generate_flat_name (be_interface *node) { // @@ The following code is *NOT* exception-safe. - char *buf = 0; + char *buf = nullptr; node->compute_flat_name ("AMH_", "", buf); // @@ This whole thing would be more efficient if we could pass the @@ -306,7 +306,7 @@ be_visitor_amh_interface_ss::generate_full_skel_name (be_interface *node) ACE_CString result ("POA_"); // @@ The following code is *NOT* exception-safe. - char *buf = 0; + char *buf = nullptr; node->compute_full_name ("AMH_", "", buf); result += buf; // buf was allocated using ACE_OS::strdup, so we must use free instead diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp index 6f010faf6a4..c98f439df44 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp @@ -208,7 +208,7 @@ be_visitor_ami4ccm_rh_ex_idl::pre_process (be_decl *node) be_operation *op = dynamic_cast<be_operation*> (this->ctx_->scope ()); - if (op == 0) + if (op == nullptr) { return 0; } @@ -217,7 +217,7 @@ be_visitor_ami4ccm_rh_ex_idl::pre_process (be_decl *node) be_argument *arg = dynamic_cast<be_argument*> (node); - if (arg == 0) + if (arg == nullptr) { return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp index c3c8e849f63..f96f633096d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp @@ -15,7 +15,7 @@ be_visitor_ami4ccm_sendc_ex_idl::be_visitor_ami4ccm_sendc_ex_idl ( be_visitor_context *ctx) : be_visitor_scope (ctx), os_ (*ctx->stream ()), - iface_ (0) + iface_ (nullptr) { } @@ -171,7 +171,7 @@ be_visitor_ami4ccm_sendc_ex_idl::pre_process (be_decl *node) { be_argument *arg = dynamic_cast<be_argument*> (node); - if (arg == 0) + if (arg == nullptr) { return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp index e567aee863d..d196a6f777d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp @@ -42,7 +42,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node) *os << be_nl_2; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested ()) { @@ -63,7 +63,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node) } } - if (module != 0) + if (module != nullptr) { // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. @@ -101,7 +101,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp index 19ef2555e0e..1230ea88e28 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp @@ -112,7 +112,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) *os << be_global->core_versioning_end () << be_nl; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested ()) { @@ -133,7 +133,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) } } - if (module != 0) + if (module != nullptr) { // Some compilers handle "any" operators in a namespace corresponding // to their module, others do not. @@ -238,7 +238,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp index 3e8f278a6a2..6430de371a3 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp @@ -38,7 +38,7 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface ( if (node->n_inherits () > 0) { - AST_Type *parent = 0; + AST_Type *parent = nullptr; for (int i = 0; i < node->n_inherits (); ++i) { @@ -111,7 +111,7 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper ( return 0; } - AST_Decl *d = 0; + AST_Decl *d = nullptr; be_visitor_context ctx; ctx.stream (os); ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH); @@ -122,7 +122,7 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper ( { d = si.item (); - if (d == 0) + if (d == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_thru_poa_proxy_" @@ -132,7 +132,7 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper ( } UTL_ScopedName item_new_name (d->local_name (), - 0); + nullptr); // We pass the node's is_abstract flag to the operation // constructor so we will get the right generated operation @@ -156,21 +156,21 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper ( UTL_ExceptList *get_exceptions = attr->get_get_exceptions (); - if (0 != get_exceptions) + if (nullptr != get_exceptions) { new_attr.be_add_get_exceptions (get_exceptions->copy ()); } UTL_ExceptList *set_exceptions = attr->get_set_exceptions (); - if (0 != set_exceptions) + if (nullptr != set_exceptions) { new_attr.be_add_set_exceptions (set_exceptions->copy ()); } be_visitor_attribute attr_visitor (&ctx); attr_visitor.visit_attribute (&new_attr); - ctx.attribute (0); + ctx.attribute (nullptr); new_attr.destroy (); } } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp index 913e526c3f4..5a2a385dd74 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp @@ -61,7 +61,7 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper ( return 0; } - AST_Decl *d = 0; + AST_Decl *d = nullptr; be_visitor_context ctx; ctx.stream (os); ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS); @@ -72,7 +72,7 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper ( { d = si.item (); - if (d == 0) + if (d == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_direct_proxy" @@ -83,14 +83,14 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper ( AST_Decl::NodeType nt = d->node_type (); - UTL_ScopedName *item_new_name = 0; - UTL_ScopedName *new_name = 0; + UTL_ScopedName *item_new_name = nullptr; + UTL_ScopedName *new_name = nullptr; if (AST_Decl::NT_op == nt || AST_Decl::NT_attr == nt) { ACE_NEW_RETURN (item_new_name, UTL_ScopedName (d->local_name ()->copy (), - 0), + nullptr), -1); new_name = (UTL_ScopedName *) node->name ()->copy (); @@ -126,7 +126,7 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper ( AST_Attribute *attr = dynamic_cast<AST_Attribute*> (d); be_attribute new_attr (attr->readonly (), attr->field_type (), - 0, + nullptr, attr->is_local (), attr->is_abstract ()); new_attr.set_defined_in (node); @@ -134,21 +134,21 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper ( UTL_ExceptList *get_exceptions = attr->get_get_exceptions (); - if (0 != get_exceptions) + if (nullptr != get_exceptions) { new_attr.be_add_get_exceptions (get_exceptions->copy ()); } UTL_ExceptList *set_exceptions = attr->get_set_exceptions (); - if (0 != set_exceptions) + if (nullptr != set_exceptions) { new_attr.be_add_set_exceptions (set_exceptions->copy ()); } be_visitor_attribute attr_visitor (&ctx); attr_visitor.visit_attribute (&new_attr); - ctx.attribute (0); + ctx.attribute (nullptr); new_attr.destroy (); } } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp index f6d04fb0484..34946766165 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp @@ -37,7 +37,7 @@ be_visitor_interface::visit_scope (be_scope *node) be_interface *intf = dynamic_cast<be_interface*> (node); - if (intf == 0) + if (intf == nullptr) { return 0; } @@ -52,7 +52,7 @@ be_visitor_interface::visit_scope (be_scope *node) return 0; } - be_interface::tao_code_emitter helper = 0; + be_interface::tao_code_emitter helper = nullptr; switch (this->ctx_->state ()) { @@ -84,7 +84,7 @@ be_visitor_interface::visit_scope (be_scope *node) break; } - if (helper == 0) + if (helper == nullptr) { return 0; } @@ -113,7 +113,7 @@ int be_visitor_interface::is_amh_rh_node (be_interface *node) { //If, is implied-IDL - if (node->original_interface () != 0) + if (node->original_interface () != nullptr) { // and the name starts with AMH if (ACE_OS::strncmp (node->local_name (), "AMH", 3) == 0) @@ -130,7 +130,7 @@ void be_visitor_interface::add_abstract_op_args (AST_Operation *old_op, be_operation &new_op) { - AST_Decl *d = 0; + AST_Decl *d = nullptr; for (UTL_ScopeActiveIterator si (old_op, UTL_Scope::IK_decls); !si.is_done (); @@ -142,7 +142,7 @@ be_visitor_interface::add_abstract_op_args (AST_Operation *old_op, UTL_ExceptList *excep_list = old_op->exceptions (); - if (0 != excep_list) + if (nullptr != excep_list) { new_op.be_add_exceptions (excep_list->copy ()); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index 0b8538be6fe..1c4f509f2e1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -74,7 +74,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) << "static " << node->local_name () << "_ptr " << "_duplicate (" << node->local_name () << "_ptr obj);" << be_nl_2; - if (c == 0) + if (c == nullptr) { *os << "static void _tao_release (" << node->local_name () << "_ptr obj);" @@ -91,7 +91,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) -1); } - if (c == 0) + if (c == nullptr) { if (! this->gen_xxx_narrow ("_unchecked_narrow", node, os)) { @@ -233,7 +233,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) << be_uidt << be_uidt; } - if (c != 0) + if (c != nullptr) { // Friends declarations, component only. *os << be_nl_2 @@ -389,7 +389,7 @@ be_visitor_interface_ch::gen_abstract_ops_helper (be_interface *node, return 0; } - AST_Decl *d = 0; + AST_Decl *d = nullptr; be_visitor_context ctx; ctx.stream (os); @@ -399,7 +399,7 @@ be_visitor_interface_ch::gen_abstract_ops_helper (be_interface *node, { d = si.item (); - if (d == 0) + if (d == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_interface::") diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index ef03c91b8fe..6f13f8bc638 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -27,7 +27,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) return 0; } - be_type *bt = 0; + be_type *bt = nullptr; // Set the right type. if (this->ctx_->alias ()) @@ -99,7 +99,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "return "; - if (node->is_abstract () || c != 0) + if (node->is_abstract () || c != nullptr) { *os << "cdr << p;"; } @@ -248,7 +248,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) } // The _unchecked_narrow method, not for components. - if (c == 0 && ! this->gen_xxx_narrow ("unchecked_narrow", node)) + if (c == nullptr && ! this->gen_xxx_narrow ("unchecked_narrow", node)) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_interface_cs::") @@ -280,7 +280,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}" << be_nl_2; // The _tao_release method - if (c == 0) + if (c == nullptr) { *os << "void" << be_nl << node->full_name () << "::_tao_release (" @@ -584,7 +584,7 @@ be_visitor_interface_cs::gen_abstract_ops_helper (be_interface *node, return 0; } - AST_Decl *d = 0; + AST_Decl *d = nullptr; be_visitor_context ctx; ctx.stream (os); @@ -594,7 +594,7 @@ be_visitor_interface_cs::gen_abstract_ops_helper (be_interface *node, { d = si.item (); - if (d == 0) + if (d == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_cs::" @@ -605,10 +605,10 @@ be_visitor_interface_cs::gen_abstract_ops_helper (be_interface *node, if (d->node_type () == AST_Decl::NT_op) { - UTL_ScopedName *item_new_name = 0; + UTL_ScopedName *item_new_name = nullptr; ACE_NEW_RETURN (item_new_name, UTL_ScopedName (d->local_name ()->copy (), - 0), + nullptr), -1); UTL_ScopedName *new_op_name = diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp index 21c0f1e5e1d..8e412556b29 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp @@ -26,7 +26,7 @@ int be_visitor_interface_ex_idl::visit_interface (be_interface *node) { // Skip implied IDL nodes. - if (node->original_interface () != 0) + if (node->original_interface () != nullptr) { return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp index 7c6f8a65d19..15a358fe763 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp @@ -92,7 +92,7 @@ be_visitor_interface_is::visit_interface (be_interface *node) if (node->is_nested ()) { - be_decl *scope = 0; + be_decl *scope = nullptr; scope = dynamic_cast<be_scope*> (node->defined_in ())->decl (); *os << " POA_" << scope->name () << "::" diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp index cda960e90ef..14b7c67ffbc 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -194,7 +194,7 @@ be_visitor_interface_sh::gen_abstract_ops_helper ( return 0; } - AST_Decl *d = 0; + AST_Decl *d = nullptr; be_visitor_context ctx; ctx.stream (os); ctx.state (TAO_CodeGen::TAO_ROOT_SH); @@ -205,7 +205,7 @@ be_visitor_interface_sh::gen_abstract_ops_helper ( { d = si.item (); - if (d == 0) + if (d == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_interface_sh::") @@ -215,7 +215,7 @@ be_visitor_interface_sh::gen_abstract_ops_helper ( } UTL_ScopedName item_new_name (d->local_name (), - 0); + nullptr); if (d->node_type () == AST_Decl::NT_op) { @@ -235,21 +235,21 @@ be_visitor_interface_sh::gen_abstract_ops_helper ( UTL_ExceptList *get_exceptions = attr->get_get_exceptions (); - if (0 != get_exceptions) + if (nullptr != get_exceptions) { new_attr.be_add_get_exceptions (get_exceptions->copy ()); } UTL_ExceptList *set_exceptions = attr->get_set_exceptions (); - if (0 != set_exceptions) + if (nullptr != set_exceptions) { new_attr.be_add_set_exceptions (set_exceptions->copy ()); } be_visitor_attribute attr_visitor (&ctx); attr_visitor.visit_attribute (&new_attr); - ctx.attribute (0); + ctx.attribute (nullptr); new_attr.destroy (); } } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index 1cfc137cb60..86de660dd62 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -261,7 +261,7 @@ be_visitor_interface_ss::gen_abstract_ops_helper ( return 0; } - AST_Decl *d = 0; + AST_Decl *d = nullptr; be_visitor_context ctx; ctx.stream (os); ctx.state (TAO_CodeGen::TAO_ROOT_SS); @@ -272,7 +272,7 @@ be_visitor_interface_ss::gen_abstract_ops_helper ( { d = si.item (); - if (d == 0) + if (d == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_interface_ss::") @@ -283,14 +283,14 @@ be_visitor_interface_ss::gen_abstract_ops_helper ( AST_Decl::NodeType nt = d->node_type (); - UTL_ScopedName *item_new_name = 0; - UTL_ScopedName *new_name = 0; + UTL_ScopedName *item_new_name = nullptr; + UTL_ScopedName *new_name = nullptr; if (AST_Decl::NT_op == nt || AST_Decl::NT_attr == nt) { ACE_NEW_RETURN (item_new_name, UTL_ScopedName (d->local_name ()->copy (), - 0), + nullptr), -1); new_name = (UTL_ScopedName *) node->name ()->copy (); @@ -327,7 +327,7 @@ be_visitor_interface_ss::gen_abstract_ops_helper ( dynamic_cast<AST_Attribute*> (d); be_attribute new_attr (attr->readonly (), attr->field_type (), - 0, + nullptr, attr->is_local (), attr->is_abstract ()); new_attr.set_defined_in (node); @@ -336,7 +336,7 @@ be_visitor_interface_ss::gen_abstract_ops_helper ( UTL_ExceptList *get_exceptions = attr->get_get_exceptions (); - if (0 != get_exceptions) + if (nullptr != get_exceptions) { new_attr.be_add_get_exceptions (get_exceptions->copy ()); } @@ -344,14 +344,14 @@ be_visitor_interface_ss::gen_abstract_ops_helper ( UTL_ExceptList *set_exceptions = attr->get_set_exceptions (); - if (0 != set_exceptions) + if (nullptr != set_exceptions) { new_attr.be_add_set_exceptions (set_exceptions->copy ()); } be_visitor_attribute attr_visitor (&ctx); attr_visitor.visit_attribute (&new_attr); - ctx.attribute (0); + ctx.attribute (nullptr); new_attr.destroy (); } } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp index aad105b595a..5399e978a4d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp @@ -24,7 +24,7 @@ be_visitor_interface_smart_proxy_ch::~be_visitor_interface_smart_proxy_ch (void) int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -115,7 +115,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) { be_interface *inherited = dynamic_cast<be_interface*> (node->inherits ()[i]); - be_decl *scope = 0; + be_decl *scope = nullptr; if (inherited->is_nested ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp index 9c1a935c8fd..b93ec9fdeb5 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp @@ -48,14 +48,14 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd ( *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested () && node->defined_in ()->scope_node_type () == AST_Decl::NT_module) { module = dynamic_cast<be_module*> (node->defined_in ()); - if (0 == module) + if (nullptr == module) { ACE_ERROR_RETURN ((LM_ERROR, "be_visitor_valuebox_any_op_ch::" @@ -101,7 +101,7 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd ( *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp b/TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp index 9917cbac4f4..60ebcd611ab 100644 --- a/TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp @@ -30,7 +30,7 @@ be_visitor_member_type_decl::visit_array (be_array *) { be_type *bt = this->ctx_->alias (); - if (bt == 0) + if (bt == nullptr) { /// Support anonymous types? return -1; @@ -110,7 +110,7 @@ be_visitor_member_type_decl::visit_sequence (be_sequence *) { be_type *bt = this->ctx_->alias (); - if (bt == 0) + if (bt == nullptr) { /// Support anonymous types? return -1; @@ -151,7 +151,7 @@ be_visitor_member_type_decl::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp index 85636db20ea..e4ae891dbf6 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp @@ -29,7 +29,7 @@ be_visitor_module_ch::visit_module (be_module *node) } TAO_OutStream *os = this->ctx_->stream (); - TAO_OutStream *aos = 0; + TAO_OutStream *aos = nullptr; *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp b/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp index 91c17cabbbb..85327630d02 100644 --- a/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp +++ b/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp @@ -122,7 +122,7 @@ be_visitor_null_return_value::visit_sequence (be_sequence *node) const char *fname = node->full_name (); be_typedef *td = this->ctx_->tdef (); - if (td != 0) + if (td != nullptr) { fname = td->full_name (); } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp index 18a6805b3c1..8bbfa8a6dfd 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp @@ -46,8 +46,8 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node) : node->defined_in (); // Needs to be one or the other. - if (dynamic_cast<be_interface*> (s) == 0 - && dynamic_cast<be_porttype*> (s) == 0) + if (dynamic_cast<be_interface*> (s) == nullptr + && dynamic_cast<be_porttype*> (s) == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_amh_rh_operation_sh::") diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp index c4efea27089..fadf960fa60 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp @@ -45,11 +45,11 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node) be_interface *intf = dynamic_cast<be_interface*> (s); - if (intf == 0) + if (intf == nullptr) { be_porttype *pt = dynamic_cast<be_porttype*> (s); - if (pt == 0) + if (pt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_amh_rh_operation_sh::") @@ -63,14 +63,14 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node) } } - char *buf = 0; + char *buf = nullptr; intf->compute_full_name ("TAO_", "", buf); ACE_CString response_handler_implementation_name ("POA_"); response_handler_implementation_name += buf; // buf was allocated by ACE_OS::strdup, so we need to use free instead // of delete. ACE_OS::free (buf); - buf = 0; + buf = nullptr; // Step 1 : Generate return type: always void *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl @@ -125,7 +125,7 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node) // 4) The implied valuetype ends in ExceptionHolder const char *last_underbar = ACE_OS::strrchr (node->full_name (), '_'); - if (last_underbar != 0 + if (last_underbar != nullptr && ACE_OS::strcmp (last_underbar, "_excep") == 0) { if (node->nmembers () == 1) @@ -140,13 +140,13 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node) be_valuetype *vt = dynamic_cast<be_valuetype*> (argument->field_type ()); - if (vt != 0 + if (vt != nullptr && vt->original_interface () == intf->original_interface ()) { const char *last_E = ACE_OS::strrchr (vt->full_name (), 'E'); - if (last_E != 0 + if (last_E != nullptr && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0) { is_an_exception_reply = 1; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp index f3a5022521a..026a72b40aa 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp @@ -55,7 +55,7 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node) be_argument *argument = dynamic_cast<be_argument*> (i.item ()); - if (argument == 0 + if (argument == nullptr || argument->direction () == AST_Argument::dir_OUT) { continue; @@ -141,14 +141,14 @@ be_visitor_amh_operation_sh::generate_shared_prologue ( be_interface *intf = dynamic_cast<be_interface*> (node->defined_in ()); - if (this->ctx_->attribute () != 0) + if (this->ctx_->attribute () != nullptr) { intf = dynamic_cast<be_interface*> ( this->ctx_->attribute()->defined_in () ); } - if (intf == 0) + if (intf == nullptr) { ACE_ERROR ((LM_ERROR, "(%N:%l) be_visitor_amh_operation_sh::" @@ -177,5 +177,5 @@ be_visitor_amh_operation_sh::generate_shared_prologue ( // buf was allocated by ACE_OS::strdup, so we must use free instead // of delete. ACE_OS::free (buf); - buf = 0; + buf = nullptr; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp index 9fd0fdbc8d6..54a44778b5c 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp @@ -64,7 +64,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node) be_argument *argument = dynamic_cast<be_argument*> (si.item ()); - if (argument == 0 + if (argument == nullptr || argument->direction () == AST_Argument::dir_OUT) { continue; @@ -101,7 +101,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node) be_argument *argument = dynamic_cast<be_argument*> (sj.item ()); - if (argument == 0 + if (argument == nullptr || argument->direction () == AST_Argument::dir_OUT) { continue; @@ -155,7 +155,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node) i.next (); - if (argument == 0 + if (argument == nullptr || argument->direction () == AST_Argument::dir_OUT) { continue; @@ -310,7 +310,7 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node, be_interface *intf = dynamic_cast<be_interface*> (node->defined_in ()); - if (intf == 0) + if (intf == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_operation_ss::" @@ -327,7 +327,7 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node, // buf was allocated by ACE_OS::strdup, so we need to use free instead // of delete. ACE_OS::free (buf); - buf = 0; + buf = nullptr; *os << "void" << be_nl << amh_skel_name.c_str () << "::" @@ -377,7 +377,7 @@ be_visitor_amh_operation_ss::generate_shared_section (be_decl *node, // buf was allocated by ACE_OS::strdup, so we need to use free instead // of delete. ACE_OS::free (buf); - buf = 0; + buf = nullptr; *os << be_nl << "TAO_ORB_Core *orb_core =" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp index f1a910055dc..81c5081e537 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -64,7 +64,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) be_decl *parent = dynamic_cast<be_scope*> (node->defined_in ())->decl (); - if (parent == 0) + if (parent == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_operation_ami_cs::" @@ -103,7 +103,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) if (node->has_native ()) // native exists => no stub { be_predefined_type bpt (AST_PredefinedType::PT_void, - 0); + nullptr); int const status = this->gen_raise_exception ("::CORBA::MARSHAL", ""); @@ -156,7 +156,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) << "{" << be_idt_nl << "std::addressof(_tao_retval)"; - AST_Argument *arg = 0; + AST_Argument *arg = nullptr; UTL_ScopeActiveIterator arg_list_iter (ami_op, UTL_Scope::IK_decls); @@ -245,7 +245,7 @@ int be_visitor_operation_ami_cs::visit_argument (be_argument *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; // argument type + be_type *bt = nullptr; // argument type // Retrieve the type for this argument. bt = dynamic_cast<be_type*> (node->field_type ()); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp index 574b8ab2c4b..5832c2d2768 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp @@ -44,7 +44,7 @@ int be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation ( be_operation *node) { - be_type *bt = 0; + be_type *bt = nullptr; be_visitor_context ctx; TAO_OutStream *os = this->ctx_->stream (); @@ -155,7 +155,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation ( *os << be_nl << "static TAO::Exception_Data " << "exceptions_data [] =" << be_nl; *os << "{" << be_idt_nl; - be_exception *ex = 0; + be_exception *ex = nullptr; // Initialize an iterator to iterate thru the exception list. // Continue until each element is visited. @@ -246,7 +246,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_argument ( ) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; // Retrieve the type for this argument. bt = dynamic_cast<be_type*> (node->field_type ()); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp index 76b455fc588..05f8a3508f6 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp @@ -149,12 +149,12 @@ be_visitor_operation_arglist::visit_argument (be_argument *node) // generate the appropriate relative scoped names. be_operation *op = dynamic_cast<be_operation*> (this->ctx_->scope ()); - be_interface *intf = 0; + be_interface *intf = nullptr; // We need the interface node in which this operation was defined. However, // if this operation node was an attribute node in disguise, we get this // information from the context - if (op == 0) + if (op == nullptr) { be_factory *f = dynamic_cast<be_factory*> (this->ctx_->scope ()); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp index bb0675176a2..0e47505f607 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp @@ -89,7 +89,7 @@ be_visitor_operation_argument::visit_argument (be_argument *node) be_operation *op = dynamic_cast<be_operation*> (this->ctx_->scope ()); - if (op == 0) + if (op == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_arglist::" diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp index 3a44607cc82..e1d7b1dc576 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp @@ -193,7 +193,7 @@ be_visitor_args_decl::visit_array (be_array *node) be_argument *f = dynamic_cast<be_argument*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_args_decl::" @@ -275,6 +275,6 @@ be_visitor_args_decl::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp index 7dda3e5b466..97493a1a922 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp @@ -34,11 +34,11 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation ( be_interface *intf = dynamic_cast<be_interface*> (s); - if (intf == 0) + if (intf == nullptr) { be_porttype *pt = dynamic_cast<be_porttype*> (s); - if (pt == 0) + if (pt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_operation_") @@ -153,7 +153,7 @@ be_visitor_operation_direct_proxy_impl_ss::gen_invoke ( return 0; } - AST_Argument *arg = 0; + AST_Argument *arg = nullptr; int index = 1; for (; !si.is_done (); si.next (), ++index) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp index 0c1f75cf3d3..46c268cfbec 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp @@ -41,7 +41,7 @@ be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node) << "_exceptiondata [] = " << be_idt_nl; *os << "{" << be_idt_nl; - be_exception *ex = 0; + be_exception *ex = nullptr; // Initialize an iterator to iterate thru the exception list. // Continue until each element is visited. diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index 597bfccc55e..39bf64b8b00 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -82,7 +82,7 @@ be_visitor_operation::count_non_out_parameters (be_operation *node) be_valuetype *vt = dynamic_cast<be_valuetype*> (bd->field_type ()); - if ((bd->direction () != AST_Argument::dir_OUT) && vt == 0) + if ((bd->direction () != AST_Argument::dir_OUT) && vt == nullptr) { ++count; } @@ -106,7 +106,7 @@ be_visitor_operation::is_amh_exception_holder (be_interface *node) { //ACE_DEBUG ((LM_DEBUG, "Passed first test of amh_excepholder\n")); const char *last_E = ACE_OS::strrchr (node->full_name (), 'E'); - if (last_E != 0 + if (last_E != nullptr && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0) { //ACE_DEBUG ((LM_DEBUG, "be_visitor_operation: Passed second test of amh_excepholder\n")); @@ -142,11 +142,11 @@ be_visitor_operation::gen_stub_operation_body ( be_interface *intf = dynamic_cast<be_interface*> (s); - if (intf == 0) + if (intf == nullptr) { be_porttype *pt = dynamic_cast<be_porttype*> (s); - if (pt == 0) + if (pt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_operation::") @@ -215,7 +215,7 @@ be_visitor_operation::gen_stub_operation_body ( << "{" << be_idt_nl << "std::addressof(_tao_retval)"; - AST_Argument *arg = 0; + AST_Argument *arg = nullptr; for (UTL_ScopeActiveIterator arg_list_iter (node, UTL_Scope::IK_decls); ! arg_list_iter.is_done (); @@ -408,7 +408,7 @@ be_visitor_operation::gen_stub_body_arglist (be_operation *node, TAO_OutStream *os, bool ami) { - AST_Argument *arg = 0; + AST_Argument *arg = nullptr; UTL_ScopeActiveIterator arg_decl_iter (node, UTL_Scope::IK_decls); if (ami) @@ -459,7 +459,7 @@ be_visitor_operation::gen_arg_template_param_name (AST_Decl *scope, AST_Type *bt, TAO_OutStream *os) { - AST_Typedef *alias = 0; + AST_Typedef *alias = nullptr; if (bt->node_type () == AST_Decl::NT_typedef) { @@ -481,7 +481,7 @@ be_visitor_operation::gen_arg_template_param_name (AST_Decl *scope, { *os << "::TAO::"; - if (alias != 0) + if (alias != nullptr) { *os << alias->local_name () << "_" << bound; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp index e25ce6210a4..1e9dd16b0d1 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp @@ -102,7 +102,7 @@ be_visitor_operation_ch::visit_operation (be_operation *node) /// If we are in a reply handler, are not an excep_* operation, /// and have no native args, then generate the AMI static /// reply stub declaration. - if (intf != 0 + if (intf != nullptr && intf->is_ami_rh () && !node->is_excep_ami () && !node->has_native ()) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp index f6e027b2ade..16f89d43138 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp @@ -49,11 +49,11 @@ be_visitor_operation_cs::visit_operation (be_operation *node) be_interface *intf = dynamic_cast<be_interface*> (s); - if (intf == 0) + if (intf == nullptr) { be_porttype *pt = dynamic_cast<be_porttype*> (s); - if (pt == 0) + if (pt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_operation_cs::") @@ -65,7 +65,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node) { intf = this->ctx_->interface (); - if (intf == 0) + if (intf == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_operation_cs::") @@ -142,7 +142,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node) /// If we are in a reply handler, are not an execp_* operation, /// and have no native args, then generate the AMI static /// reply stub declaration. - if (intf != 0 + if (intf != nullptr && intf->is_ami_rh () && !node->is_excep_ami () && !node->has_native ()) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp index ee50ef97f01..7d17b1d940e 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp @@ -14,7 +14,7 @@ be_visitor_operation_exs::be_visitor_operation_exs (be_visitor_context *ctx) : be_visitor_scope (ctx), os_ (*ctx->stream ()), - scope_ (0), + scope_ (nullptr), your_code_here_ ("/* Your code here. */"), class_extension_ ("_exec_i") { @@ -40,7 +40,7 @@ be_visitor_operation_exs::visit_operation (be_operation *node) // Retrieve the operation return type. be_type *rt = dynamic_cast<be_type*> (node->return_type ()); - if (rt == 0) + if (rt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_operation_exs::") diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp index 18019fe4fd9..b762b030ae0 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp @@ -64,7 +64,7 @@ be_visitor_operation_is::visit_operation (be_operation *node) -1); } - const char *classname = 0; + const char *classname = nullptr; if (intf) { diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp index 88e6e0fc0e4..26832111428 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -30,7 +30,7 @@ be_visitor_operation_ss::visit_operation (be_operation * node) } TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; this->ctx_->node (node); @@ -129,7 +129,7 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node, be_interface *intf = dynamic_cast<be_interface*> (s); - if (intf == 0) + if (intf == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_operation_ss::") diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp index 49633e611a3..e10bb890dad 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp @@ -15,7 +15,7 @@ be_visitor_operation_svs::be_visitor_operation_svs ( be_visitor_context *ctx) : be_visitor_scope (ctx), - scope_ (0) + scope_ (nullptr) { } @@ -39,7 +39,7 @@ be_visitor_operation_svs::visit_operation (be_operation *node) // Retrieve the operation return type. be_type *bt = dynamic_cast<be_type*> (node->return_type ()); - if (bt == 0) + if (bt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "be_visitor_operation_svs::" diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp index 8096821e52e..c52392fb9e5 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp @@ -76,7 +76,7 @@ int be_visitor_operation_rettype::visit_predefined_type ( be_predefined_type *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -195,7 +195,7 @@ be_visitor_operation_rettype::visit_typedef ( -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -286,9 +286,9 @@ be_visitor_operation_rettype::visit_valuebox ( const char * be_visitor_operation_rettype::type_name (be_type *node) { - be_type *bt = 0; + be_type *bt = nullptr; - if (this->ctx_->alias () != 0) + if (this->ctx_->alias () != nullptr) { // A typedefed return type. bt = this->ctx_->alias (); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp index dffded06c3e..dc7f816c4fb 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp @@ -189,7 +189,7 @@ be_visitor_operation_rettype_return_cs::visit_typedef ( -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp index 6f39ed187ba..b179225b8c5 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp @@ -39,11 +39,11 @@ int be_visitor_operation_smart_proxy_cs::visit_operation (be_operation *node) be_interface *intf = dynamic_cast<be_interface*> (s); - if (intf == 0) + if (intf == nullptr) { be_porttype *pt = dynamic_cast<be_porttype*> (s); - if (pt == 0) + if (pt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_operation_") diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp index df342b6eb2d..8669184bf1d 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp @@ -129,7 +129,7 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node) be_predefined_type *pdt = dynamic_cast<be_predefined_type*> (bt); - if (pdt == 0 || pdt->pt () != AST_PredefinedType::PT_void) + if (pdt == nullptr || pdt->pt () != AST_PredefinedType::PT_void) { *os << "return "; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp index 6f7c97458de..5680ed71cca 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp @@ -47,7 +47,7 @@ be_visitor_operation_upcall_command_ss::visit ( -1); } - be_module *module = 0; + be_module *module = nullptr; TAO_OutStream & os = *this->ctx_->stream (); @@ -59,7 +59,7 @@ be_visitor_operation_upcall_command_ss::visit ( { module = dynamic_cast<be_module*> (intf->defined_in ()); - if (module == 0) + if (module == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_operation_") @@ -200,7 +200,7 @@ be_visitor_operation_upcall_command_ss::visit ( os << be_uidt_nl << "};"; - if (module != 0) + if (module != nullptr) { be_util::gen_nested_namespace_end (&os, module); } @@ -239,7 +239,7 @@ be_visitor_operation_upcall_command_ss::gen_upcall ( be_valuetype *value_type = dynamic_cast<be_valuetype*> (argument->field_type ()); - if (value_type != 0) + if (value_type != nullptr) { static const char *excepholder = "ExceptionHolder"; static const size_t excepholder_len = diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp index 44adb8fb6c7..30a4e8cad78 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp @@ -17,7 +17,7 @@ be_visitor_root_ch::be_visitor_root_ch (be_visitor_context *ctx) : be_visitor_root (ctx), - o_ (0) + o_ (nullptr) { } @@ -185,7 +185,7 @@ be_visitor_root_ch::gen_ref_counting_overrides (void) } size_t index = 0; - be_interface_fwd *ifwd = 0; + be_interface_fwd *ifwd = nullptr; *o_ << be_nl_2 << "// TAO_IDL - Generated from" << be_nl @@ -231,7 +231,7 @@ be_visitor_root_ch::gen_static_corba_overrides (void) } size_t index = 0; - AST_Interface *i = 0; + AST_Interface *i = nullptr; *o_ << be_nl_2 << "// TAO_IDL - Generated from" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_scope.cpp b/TAO/TAO_IDL/be/be_visitor_scope.cpp index e14d67a2e85..3bb7e5b17d6 100644 --- a/TAO/TAO_IDL/be/be_visitor_scope.cpp +++ b/TAO/TAO_IDL/be/be_visitor_scope.cpp @@ -37,7 +37,7 @@ be_visitor_scope::~be_visitor_scope (void) int be_visitor_scope::visit_scope (be_scope *node) { - if (node == 0) + if (node == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_scope::visit_scope - " @@ -54,7 +54,7 @@ be_visitor_scope::visit_scope (be_scope *node) { AST_Decl *d = si.item (); - if (d == 0) + if (d == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_scope::visit_scope - " @@ -88,7 +88,7 @@ be_visitor_scope::visit_scope (be_scope *node) } // Send the visitor. - if (bd == 0 || bd->accept (this) == -1) + if (bd == nullptr || bd->accept (this) == -1) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_scope::visit_scope - " @@ -134,14 +134,14 @@ be_visitor_scope::next_elem (be_decl *elem, be_decl *&successor) { be_decl *ctx_scope = this->ctx_->scope ()->decl (); - be_scope *node = 0; + be_scope *node = nullptr; - if (ctx_scope != 0) + if (ctx_scope != nullptr) { node = ctx_scope->scope (); } - if (ctx_scope == 0 || node == 0) + if (ctx_scope == nullptr || node == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_scope::next_elem - " @@ -149,7 +149,7 @@ be_visitor_scope::next_elem (be_decl *elem, -1); } - successor = 0; + successor = nullptr; // Initialize an iterator to iterate thru our scope. for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls); @@ -158,7 +158,7 @@ be_visitor_scope::next_elem (be_decl *elem, { be_decl *bd = dynamic_cast<be_decl*> (si.item ()); - if (bd == 0) + if (bd == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_scope::next_elem - " @@ -182,7 +182,7 @@ be_visitor_scope::next_elem (be_decl *elem, successor = dynamic_cast<be_decl*> (si.item ()); - if (successor == 0) + if (successor == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_scope::next_elem - " @@ -200,22 +200,22 @@ be_visitor_scope::next_elem (be_decl *elem, bool be_visitor_scope::last_node (be_decl *bd) { - be_decl *next = 0; + be_decl *next = nullptr; (void) this->next_elem (bd, next); - return (next == 0); + return (next == nullptr); } bool be_visitor_scope::last_inout_or_out_node (be_decl *) { // Return true if we are the last inout or out argument. - be_decl *next = 0; + be_decl *next = nullptr; (void) this->next_elem (this->ctx_->node (), next); - while (next != 0) + while (next != nullptr) { be_argument *arg = dynamic_cast<be_argument*> (next); @@ -226,7 +226,7 @@ be_visitor_scope::last_inout_or_out_node (be_decl *) return false; } - be_decl *next_next = 0; + be_decl *next_next = nullptr; this->next_elem (next, next_next); diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp index 664ada9f408..ec746bdf168 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp @@ -66,7 +66,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) name = node->full_name (); } - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested ()) { AST_Decl *d = node; @@ -86,7 +86,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) } } - if (module != 0) + if (module != nullptr) { // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. @@ -150,7 +150,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp index a8a4e22d44d..fa837b11d13 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp @@ -71,8 +71,8 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) { tc = ANY_ARRAY; } - else if (dynamic_cast<be_interface*> (bt) != 0 - && dynamic_cast<be_valuetype*> (bt) == 0) + else if (dynamic_cast<be_interface*> (bt) != nullptr + && dynamic_cast<be_valuetype*> (bt) == nullptr) { tc = ANY_OBJREF; } @@ -184,7 +184,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) // for the TypeCode to pass to the Any operator impls. be_typedef *td = this->ctx_->tdef (); - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested ()) { AST_Decl *d = node; @@ -204,7 +204,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) } } - if (module != 0) + if (module != nullptr) { // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. @@ -224,7 +224,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl - << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl + << "::" << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem);" << be_uidt << be_uidt_nl << "}" << be_nl_2; @@ -240,7 +240,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl - << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl + << "::" << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem);" << be_uidt << be_uidt_nl << "}" << be_nl_2; @@ -256,7 +256,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl - << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl + << "::" << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem);" << be_uidt << be_uidt_nl << "}"; @@ -283,7 +283,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl - << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl + << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem);" << be_uidt << be_uidt_nl << "}" << be_nl_2; @@ -299,7 +299,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl - << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl + << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem);" << be_uidt << be_uidt_nl << "}" << be_nl_2; @@ -315,14 +315,14 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl - << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl + << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem);" << be_uidt << be_uidt_nl << "}"; *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } 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 b8b8398c3bd..885209896a0 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp @@ -31,7 +31,7 @@ int be_visitor_sequence_buffer_type::visit_node (be_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -269,6 +269,6 @@ be_visitor_sequence_buffer_type::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp index a5dd172bc0f..0b0c57e14de 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp @@ -66,7 +66,7 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) // If we're an anonymous sequence, we must protect against // being declared more than once. - if (tdef == 0) + if (tdef == nullptr) { *os << "\n\n#if !defined _TAO_CDR_OP_" << node->flat_name () << "_H_" @@ -122,7 +122,7 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) *os << be_nl << be_global->core_versioning_end () << be_nl; - if (tdef == 0) + if (tdef == nullptr) { *os << "\n\n#endif /* _TAO_CDR_OP_" << node->flat_name () << "_H_ */"; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp index 6602ec8030e..fa00636f9b9 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp @@ -41,7 +41,7 @@ int be_visitor_sequence_base::visit_node (be_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -172,7 +172,7 @@ be_visitor_sequence_base::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -194,7 +194,7 @@ int be_visitor_sequence_base_template_args::visit_interface (be_interface *node) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -225,7 +225,7 @@ be_visitor_sequence_base_template_args::visit_interface_fwd ( ) { TAO_OutStream *os = this->ctx_->stream (); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index 55d0a3693fd..a57da7c7e63 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -23,7 +23,7 @@ be_visitor_sequence_ch::~be_visitor_sequence_ch (void) int be_visitor_sequence_ch::visit_sequence (be_sequence *node) { - if (node->defined_in () == 0) + if (node->defined_in () == nullptr) { // The node is a nested sequence, and has had no scope defined. node->set_defined_in (DeclAsScope (this->ctx_->scope ()->decl ())); @@ -57,7 +57,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) // generation for the base type. be_type *bt = dynamic_cast<be_type*> (node->base_type ()); - if (bt == 0) + if (bt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_sequence_ch::") @@ -77,7 +77,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) // to create_name will not get confused and give our anonymous // sequence element type the same name as we have. be_typedef *tmp = this->ctx_->tdef (); - this->ctx_->tdef (0); + this->ctx_->tdef (nullptr); if (bt->accept (this) != 0) { @@ -133,12 +133,12 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) /// and _outs. They may get redefined and reinstated later. if (!be_global->alt_mapping () || !node->unbounded ()) { - if (this->ctx_->tdef () != 0) + if (this->ctx_->tdef () != nullptr) { *os << "class " << node->local_name () << ";"; } - if (this->ctx_->tdef () != 0) + if (this->ctx_->tdef () != nullptr) { this->gen_varout_typedefs (node, bt); } @@ -263,14 +263,14 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) // TAO provides extensions for octet sequences, first find out if // the base type is an octet (or an alias for octet). - be_predefined_type *predef = 0; + be_predefined_type *predef = nullptr; if (bt->base_node_type () == AST_Type::NT_pre_defined) { be_typedef* alias = dynamic_cast<be_typedef*> (bt); - if (alias == 0) + if (alias == nullptr) { predef = dynamic_cast<be_predefined_type*> (bt); } @@ -284,7 +284,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) } // Now generate the extension... - if (predef != 0 + if (predef != nullptr && predef->pt () == AST_PredefinedType::PT_octet && node->unbounded () && !be_global->alt_mapping ()) diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp index f009869b00c..58fc4920cc1 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -55,7 +55,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) be_type *bt = dynamic_cast<be_type*> (node->base_type ()); - if (bt == 0) + if (bt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_sequence_cs::") @@ -74,7 +74,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) // to create_name will not get confused and give our anonymous // sequence element type the same name as we have. be_typedef *tmp = this->ctx_->tdef (); - this->ctx_->tdef (0); + this->ctx_->tdef (nullptr); if (bt->accept (this) != 0) { diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp index b27043e3911..f71334af9f7 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp @@ -41,7 +41,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node) *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested ()) { AST_Decl *d = node; @@ -61,7 +61,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node) } } - if (module != 0) + if (module != nullptr) { // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. @@ -95,7 +95,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } @@ -117,7 +117,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node) int be_visitor_structure_any_op_ch::visit_field (be_field *node) { - be_type *bt = 0; + be_type *bt = nullptr; // First generate the type information. bt = dynamic_cast<be_type*> (node->field_type ()); diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp index a73227ce818..3364f651beb 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp @@ -77,7 +77,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) } - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested ()) { AST_Decl *d = node; @@ -97,7 +97,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) } } - if (module != 0) + if (module != nullptr) { // Some compilers handle "any" operators in a namespace corresponding // to their module, others do not. @@ -213,7 +213,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_template_export.cpp b/TAO/TAO_IDL/be/be_visitor_template_export.cpp index f4001260781..61e90903056 100644 --- a/TAO/TAO_IDL/be/be_visitor_template_export.cpp +++ b/TAO/TAO_IDL/be/be_visitor_template_export.cpp @@ -75,14 +75,14 @@ be_visitor_template_export::visit_sequence (be_sequence *node) // TAO provides extensions for octet sequences, first find out if // the base type is an octet (or an alias for octet). - be_predefined_type *predef = 0; + be_predefined_type *predef = nullptr; if (bt->base_node_type () == AST_Type::NT_pre_defined) { be_typedef* alias = dynamic_cast<be_typedef*> (bt); - if (alias == 0) + if (alias == nullptr) { predef = dynamic_cast<be_predefined_type*> (bt); } @@ -96,7 +96,7 @@ be_visitor_template_export::visit_sequence (be_sequence *node) } // When it is a sequence add a special guard - if (predef != 0 && predef->pt () == AST_PredefinedType::PT_octet + if (predef != nullptr && predef->pt () == AST_PredefinedType::PT_octet && node->unbounded ()) { *os << "\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 0)"; @@ -119,7 +119,7 @@ be_visitor_template_export::visit_sequence (be_sequence *node) *os << ";" << be_uidt; - if (predef != 0 && predef->pt () == AST_PredefinedType::PT_octet + if (predef != nullptr && predef->pt () == AST_PredefinedType::PT_octet && node->unbounded ()) { *os << "\n#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 0 */"; @@ -143,6 +143,6 @@ be_visitor_template_export::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp index 5e8b8b590d0..49ffb14b144 100644 --- a/TAO/TAO_IDL/be/be_visitor_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp @@ -485,7 +485,7 @@ be_visitor_traits::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); node->cli_traits_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp index 9209875fc37..74177b36dbc 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp @@ -30,7 +30,7 @@ TAO::be_visitor_objref_typecode::visit_interface (be_interface * node) static char const local_interface[] = "local_interface"; static char const objref[] = "objref"; - char const * kind = 0; + char const * kind = nullptr; if (dynamic_cast<be_component *> (node)) kind = component; diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp index 26fb914ad63..ff909252566 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp @@ -39,7 +39,7 @@ TAO::be_visitor_struct_typecode::visit_structure (be_structure * node) // we're repeated and we're recursive so just leave return 0; } - else if (this->queue_insert (this->tc_queue_, node, 0) == 0) + else if (this->queue_insert (this->tc_queue_, node, 0) == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_struct_typecode::" @@ -175,7 +175,7 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node, int TAO::be_visitor_struct_typecode::gen_member_typecodes (AST_Structure * node) { - AST_Field ** member_ptr = 0; + AST_Field ** member_ptr = nullptr; ACE_CDR::ULong const count = node->nfields (); for (ACE_CDR::ULong i = 0; i < count; ++i) @@ -217,7 +217,7 @@ TAO::be_visitor_struct_typecode::gen_member_typecodes (AST_Structure * node) int TAO::be_visitor_struct_typecode::visit_members (AST_Structure * node) { - AST_Field ** member_ptr = 0; + AST_Field ** member_ptr = nullptr; ACE_CDR::ULong const count = node->nfields (); TAO_OutStream & os = *this->ctx_->stream (); 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 fa9c70aa9b7..9be0d9b310e 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp @@ -29,7 +29,7 @@ Scoped_Compute_Queue_Guard::Scoped_Compute_Queue_Guard ( ) :customer_ (customer) { - if (customer_ != 0) + if (customer_ != nullptr) { // Reset the compute queue to set the stage for computing our // encapsulation length. @@ -39,7 +39,7 @@ Scoped_Compute_Queue_Guard::Scoped_Compute_Queue_Guard ( Scoped_Compute_Queue_Guard::~Scoped_Compute_Queue_Guard (void) { - if (customer_ != 0) + if (customer_ != nullptr) { // Reset the compute queue since we must not affect computation of other // nodes. @@ -100,7 +100,7 @@ be_visitor_typecode_defn::gen_typecode_ptr (be_type * node) be_module * const module = dynamic_cast<be_module*> (node->defined_in ()); - if (module == 0) + if (module == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_typecode_defn::") @@ -190,7 +190,7 @@ be_visitor_typecode_defn::gen_forward_declared_typecode (be_type * node) be_module * const module = dynamic_cast<be_module*> (node->defined_in ()); - if (module == 0) + if (module == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_typecode_defn::") @@ -238,7 +238,7 @@ be_visitor_typecode_defn::is_typecode_generation_required (be_type * node) true); be_interface * const intf = - d != 0 ? dynamic_cast<be_interface*> (d) : 0; + d != nullptr ? dynamic_cast<be_interface*> (d) : nullptr; if (intf && intf->is_defined ()) { @@ -711,9 +711,9 @@ be_visitor_typecode_defn::queue_insert ( ACE_CDR::Long offset ) { - be_visitor_typecode_defn::QNode *qnode = 0; + be_visitor_typecode_defn::QNode *qnode = nullptr; - ACE_NEW_RETURN (qnode, be_visitor_typecode_defn::QNode, 0); + ACE_NEW_RETURN (qnode, be_visitor_typecode_defn::QNode, nullptr); qnode->node = node; qnode->offset = offset; @@ -741,8 +741,8 @@ be_visitor_typecode_defn::queue_lookup ( !iter.done (); iter.advance ()) { - be_visitor_typecode_defn::QNode **addr = 0; - be_visitor_typecode_defn::QNode *item = 0; + be_visitor_typecode_defn::QNode **addr = nullptr; + be_visitor_typecode_defn::QNode *item = nullptr; iter.next (addr); item = *addr; @@ -754,7 +754,7 @@ be_visitor_typecode_defn::queue_lookup ( } } - return 0; + return nullptr; } void @@ -763,7 +763,7 @@ queue_reset (ACE_Unbounded_Queue <be_visitor_typecode_defn::QNode *> & queue) { while (!queue.is_empty ()) { - be_visitor_typecode_defn::QNode * qnode = 0; + be_visitor_typecode_defn::QNode * qnode = nullptr; (void) queue.dequeue_head (qnode); delete qnode; } diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp index 0e25abc58b3..4ed2f4d340a 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp @@ -39,7 +39,7 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node) // we're repeated and we're recursive so just leave return 0; } - else if (this->queue_insert (this->tc_queue_, node, 0) == 0) + else if (this->queue_insert (this->tc_queue_, node, 0) == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_typecode::" @@ -67,7 +67,7 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node) be_type * const discriminant_type = dynamic_cast<be_type*> (node->disc_type ()); - ACE_ASSERT (discriminant_type != 0); + ACE_ASSERT (discriminant_type != nullptr); if (this->gen_case_typecodes (node) != 0) { @@ -132,7 +132,7 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node) int TAO::be_visitor_union_typecode::gen_case_typecodes (be_union * node) { - AST_Field ** member_ptr = 0; + AST_Field ** member_ptr = nullptr; ACE_CDR::ULong const count = node->nfields (); @@ -189,7 +189,7 @@ TAO::be_visitor_union_typecode::visit_cases (be_union * node) ACE_CDR::ULong const countFields = node->nfields (); for (ACE_CDR::ULong fieldNumber = 0u; fieldNumber < countFields; ++fieldNumber) { - AST_Field ** member_ptr = 0; + AST_Field ** member_ptr = nullptr; node->field (member_ptr, fieldNumber); be_type * const type = @@ -198,7 +198,7 @@ TAO::be_visitor_union_typecode::visit_cases (be_union * node) be_union_branch * const branch = dynamic_cast<be_union_branch*> (*member_ptr); - ACE_ASSERT (branch != 0); + ACE_ASSERT (branch != nullptr); ACE_CDR::ULong numberOfLabels = branch->label_list_length (); // Check for a default branch for the current union field. diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp index a6c42848bb5..0fce2fa7734 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp @@ -39,7 +39,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node) // we're repeated and we're recursive so just leave return 0; } - else if (this->queue_insert (this->tc_queue_, node, 0) == 0) + else if (this->queue_insert (this->tc_queue_, node, 0) == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_value_typecode::" 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 446cff9a3b0..5b204eddd37 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 @@ -60,7 +60,7 @@ be_visitor_typedef_any_op_ch::visit_typedef (be_typedef *node) // the type maybe. In the latter, we just need typedefs for the type and all // associated _var, _out, and other types. - be_type *bt = 0; // base type + be_type *bt = nullptr; // base type if (this->ctx_->tdef ()) { @@ -92,7 +92,7 @@ be_visitor_typedef_any_op_ch::visit_typedef (be_typedef *node) "failed to accept visitor\n"), -1); } - this->ctx_->alias (0); // reset + this->ctx_->alias (nullptr); // reset } else { @@ -122,7 +122,7 @@ be_visitor_typedef_any_op_ch::visit_typedef (be_typedef *node) -1); } - this->ctx_->tdef (0); // reset + this->ctx_->tdef (nullptr); // reset } node->cli_hdr_any_op_gen (1); @@ -132,7 +132,7 @@ be_visitor_typedef_any_op_ch::visit_typedef (be_typedef *node) int be_visitor_typedef_any_op_ch::visit_array (be_array *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -163,7 +163,7 @@ be_visitor_typedef_any_op_ch::visit_array (be_array *node) int be_visitor_typedef_any_op_ch::visit_enum (be_enum *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -193,7 +193,7 @@ be_visitor_typedef_any_op_ch::visit_enum (be_enum *node) int be_visitor_typedef_any_op_ch::visit_sequence (be_sequence *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -223,7 +223,7 @@ be_visitor_typedef_any_op_ch::visit_sequence (be_sequence *node) int be_visitor_typedef_any_op_ch::visit_structure (be_structure *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -253,7 +253,7 @@ be_visitor_typedef_any_op_ch::visit_structure (be_structure *node) int be_visitor_typedef_any_op_ch::visit_union (be_union *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp index 1ce7042fdac..c1d0de84000 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp @@ -59,7 +59,7 @@ be_visitor_typedef_any_op_cs::visit_typedef (be_typedef *node) // the type maybe. In the latter, we just need typedefs for the type and all // associated _var, _out, and other types. - be_type *bt = 0; // base type + be_type *bt = nullptr; // base type if (this->ctx_->tdef ()) { @@ -92,7 +92,7 @@ be_visitor_typedef_any_op_cs::visit_typedef (be_typedef *node) ), -1); } - this->ctx_->alias (0); // reset + this->ctx_->alias (nullptr); // reset } else { @@ -122,7 +122,7 @@ be_visitor_typedef_any_op_cs::visit_typedef (be_typedef *node) ), -1); } - this->ctx_->tdef (0); // Reset. + this->ctx_->tdef (nullptr); // Reset. } node->cli_stub_any_op_gen (true); @@ -132,7 +132,7 @@ be_visitor_typedef_any_op_cs::visit_typedef (be_typedef *node) int be_visitor_typedef_any_op_cs::visit_array (be_array *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) // typedef of a typedef bt = this->ctx_->alias (); @@ -160,7 +160,7 @@ be_visitor_typedef_any_op_cs::visit_array (be_array *node) int be_visitor_typedef_any_op_cs::visit_enum (be_enum *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) // typedef of a typedef bt = this->ctx_->alias (); @@ -187,7 +187,7 @@ be_visitor_typedef_any_op_cs::visit_enum (be_enum *node) int be_visitor_typedef_any_op_cs::visit_sequence (be_sequence *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) // typedef of a typedef bt = this->ctx_->alias (); @@ -214,7 +214,7 @@ be_visitor_typedef_any_op_cs::visit_sequence (be_sequence *node) int be_visitor_typedef_any_op_cs::visit_structure (be_structure *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) // typedef of a typedef bt = this->ctx_->alias (); @@ -241,7 +241,7 @@ be_visitor_typedef_any_op_cs::visit_structure (be_structure *node) int be_visitor_typedef_any_op_cs::visit_union (be_union *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) // typedef of a typedef bt = this->ctx_->alias (); diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp index 272d02c5658..f01cf991533 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp @@ -59,7 +59,7 @@ be_visitor_typedef_cdr_op_ch::visit_typedef (be_typedef *node) // the type maybe. In the latter, we just need typedefs for the type and all // associated _var, _out, and other types. - be_type *bt = 0; // base type + be_type *bt = nullptr; // base type if (this->ctx_->tdef ()) { @@ -92,7 +92,7 @@ be_visitor_typedef_cdr_op_ch::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); // reset + this->ctx_->alias (nullptr); // reset } else { @@ -122,7 +122,7 @@ be_visitor_typedef_cdr_op_ch::visit_typedef (be_typedef *node) -1); } - this->ctx_->tdef (0); + this->ctx_->tdef (nullptr); } node->cli_hdr_cdr_op_gen (1); @@ -132,7 +132,7 @@ be_visitor_typedef_cdr_op_ch::visit_typedef (be_typedef *node) int be_visitor_typedef_cdr_op_ch::visit_array (be_array *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -163,7 +163,7 @@ be_visitor_typedef_cdr_op_ch::visit_array (be_array *node) int be_visitor_typedef_cdr_op_ch::visit_enum (be_enum *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -193,7 +193,7 @@ be_visitor_typedef_cdr_op_ch::visit_enum (be_enum *node) int be_visitor_typedef_cdr_op_ch::visit_sequence (be_sequence *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -223,7 +223,7 @@ be_visitor_typedef_cdr_op_ch::visit_sequence (be_sequence *node) int be_visitor_typedef_cdr_op_ch::visit_structure (be_structure *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -253,7 +253,7 @@ be_visitor_typedef_cdr_op_ch::visit_structure (be_structure *node) int be_visitor_typedef_cdr_op_ch::visit_union (be_union *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp index c7bc2252879..2b0f9ef0bae 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp @@ -55,7 +55,7 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node) // the type maybe. In the latter, we just need typedefs for the type and all // associated _var, _out, and other types. - be_type *bt = 0; // base type + be_type *bt = nullptr; // base type if (this->ctx_->tdef ()) { @@ -88,7 +88,7 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); // reset + this->ctx_->alias (nullptr); // reset } else { @@ -118,7 +118,7 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node) -1); } - this->ctx_->tdef (0); // reset + this->ctx_->tdef (nullptr); // reset } node->cli_stub_cdr_op_gen (1); @@ -128,7 +128,7 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node) int be_visitor_typedef_cdr_op_cs::visit_array (be_array *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) // typedef of a typedef { @@ -160,7 +160,7 @@ be_visitor_typedef_cdr_op_cs::visit_array (be_array *node) int be_visitor_typedef_cdr_op_cs::visit_sequence (be_sequence *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) // typedef of a typedef { @@ -191,7 +191,7 @@ be_visitor_typedef_cdr_op_cs::visit_sequence (be_sequence *node) int be_visitor_typedef_cdr_op_cs::visit_structure (be_structure *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) // typedef of a typedef { @@ -222,7 +222,7 @@ be_visitor_typedef_cdr_op_cs::visit_structure (be_structure *node) int be_visitor_typedef_cdr_op_cs::visit_union (be_union *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) // typedef of a typedef { diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp index 59af00701bc..18af0e03647 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp @@ -48,7 +48,7 @@ be_visitor_typedef_ch::visit_typedef (be_typedef *node) // the type maybe. In the latter, we just need typedefs for the type and all // associated _var, _out, and other types. - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->tdef ()) { @@ -81,7 +81,7 @@ be_visitor_typedef_ch::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); } else { @@ -130,7 +130,7 @@ be_visitor_typedef_ch::visit_typedef (be_typedef *node) } } - this->ctx_->tdef (0); + this->ctx_->tdef (nullptr); } return 0; @@ -142,7 +142,7 @@ be_visitor_typedef_ch::visit_array (be_array *node) TAO_OutStream *os = this->ctx_->stream (); be_typedef *tdef = this->ctx_->tdef (); be_decl *scope = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Is the base type an alias to an array node or an actual array node. if (this->ctx_->alias ()) @@ -207,7 +207,7 @@ be_visitor_typedef_ch::visit_array (be_array *node) // If the typedef is not declared globally or in a module, the // associated array memory management function must be static. - if (scope == 0) + if (scope == nullptr) { static_decl = "static "; } @@ -261,7 +261,7 @@ be_visitor_typedef_ch::visit_enum (be_enum *node) TAO_OutStream *os = this->ctx_->stream (); be_typedef *tdef = this->ctx_->tdef (); be_decl *scope = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Typedef of a typedef? if (this->ctx_->alias ()) @@ -305,7 +305,7 @@ be_visitor_typedef_ch::visit_interface (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); be_typedef *tdef = this->ctx_->tdef (); be_decl *scope = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Typedef of a typedef? if (this->ctx_->alias ()) @@ -354,7 +354,7 @@ be_visitor_typedef_ch::visit_predefined_type (be_predefined_type *node) TAO_OutStream *os = this->ctx_->stream (); be_typedef *tdef = this->ctx_->tdef (); be_decl *scope = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Typedef of a typedef? if (this->ctx_->alias ()) @@ -433,7 +433,7 @@ be_visitor_typedef_ch::visit_sequence (be_sequence *node) TAO_OutStream *os = this->ctx_->stream (); be_typedef *tdef = this->ctx_->tdef (); be_decl *scope = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Typedef of a typedef? if (this->ctx_->alias ()) @@ -481,7 +481,7 @@ be_visitor_typedef_ch::visit_structure (be_structure *node) TAO_OutStream *os = this->ctx_->stream (); be_typedef *tdef = this->ctx_->tdef (); be_decl *scope = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Typedef of a typedef? if (this->ctx_->alias ()) @@ -527,7 +527,7 @@ be_visitor_typedef_ch::visit_union (be_union *node) TAO_OutStream *os = this->ctx_->stream (); be_typedef *tdef = this->ctx_->tdef (); be_decl *scope = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Typedef of a typedef? if (this->ctx_->alias ()) @@ -573,7 +573,7 @@ be_visitor_typedef_ch::visit_valuebox (be_valuebox *node) TAO_OutStream *os = this->ctx_->stream (); be_typedef *tdef = this->ctx_->tdef (); be_decl *scope = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Typedef of a typedef? if (this->ctx_->alias ()) @@ -609,7 +609,7 @@ be_visitor_typedef_ch::visit_valuetype (be_valuetype *node) TAO_OutStream *os = this->ctx_->stream (); be_typedef *tdef = this->ctx_->tdef (); be_decl *scope = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Typedef of a typedef? if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp index 04adf9b3437..b6c23ad924d 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp @@ -48,7 +48,7 @@ be_visitor_typedef_ci::visit_typedef (be_typedef *node) // the type maybe. In the latter, we just need typedefs for the type and all // associated _var, _out, and other types. - be_type *bt = 0; // base type + be_type *bt = nullptr; // base type if (this->ctx_->tdef ()) { @@ -81,7 +81,7 @@ be_visitor_typedef_ci::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); } else { @@ -111,7 +111,7 @@ be_visitor_typedef_ci::visit_typedef (be_typedef *node) -1); } - this->ctx_->tdef (0); + this->ctx_->tdef (nullptr); } return 0; @@ -122,7 +122,7 @@ be_visitor_typedef_ci::visit_array (be_array *node) { TAO_OutStream *os = this->ctx_->stream (); // output stream be_typedef *tdef = this->ctx_->tdef (); // typedef node - be_type *bt = 0; + be_type *bt = nullptr; // This doesn't catch 'typedef of a typedef' if the node is // imported, so we check for that below before generating @@ -216,7 +216,7 @@ be_visitor_typedef_ci::visit_array (be_array *node) int be_visitor_typedef_ci::visit_sequence (be_sequence *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) // typedef of a typedef { @@ -247,7 +247,7 @@ be_visitor_typedef_ci::visit_sequence (be_sequence *node) int be_visitor_typedef_ci::visit_structure (be_structure *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) // typedef of a typedef { @@ -278,7 +278,7 @@ be_visitor_typedef_ci::visit_structure (be_structure *node) int be_visitor_typedef_ci::visit_union (be_union *node) { - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) // typedef of a typedef { diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp index 6586c0cdd74..800b1ded635 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp @@ -48,7 +48,7 @@ be_visitor_typedef_cs::visit_typedef (be_typedef *node) // the type maybe. In the latter, we just need typedefs for the type and all // associated _var, _out, and other types. - be_type *bt = 0; // base type + be_type *bt = nullptr; // base type if (this->ctx_->tdef ()) { @@ -81,7 +81,7 @@ be_visitor_typedef_cs::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); } else { @@ -128,7 +128,7 @@ be_visitor_typedef_cs::visit_typedef (be_typedef *node) } - this->ctx_->tdef (0); + this->ctx_->tdef (nullptr); } return 0; @@ -137,7 +137,7 @@ be_visitor_typedef_cs::visit_typedef (be_typedef *node) int be_visitor_typedef_cs::visit_sequence (be_sequence *node) { - be_type *bt = 0; + be_type *bt = nullptr; // Typedef of a typedef? if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp index 4fe614a3ad9..4340d619a71 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp @@ -36,14 +36,14 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; - be_module *module = 0; + be_module *module = nullptr; AST_Decl *decl = node; if (decl->is_nested ()) { if (node->defined_in ()->scope_node_type () == AST_Decl::NT_interface) { - be_interface *intf = 0; + be_interface *intf = nullptr; intf = dynamic_cast<be_interface*> (node->defined_in ()); decl = intf; } @@ -94,7 +94,7 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } @@ -107,7 +107,7 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) AST_Decl *d = si.item (); be_enum *e = dynamic_cast<be_enum*> (d); - if (e != 0) + if (e != nullptr) { be_visitor_enum_any_op_ch visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index cecfe376499..26c6f573fd8 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -70,14 +70,14 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) *os << be_global->core_versioning_end () << be_nl; - be_module *module = 0; + be_module *module = nullptr; AST_Decl *decl = node; if (decl->is_nested ()) { if (node->defined_in ()->scope_node_type () == AST_Decl::NT_interface) { - be_interface *intf = 0; + be_interface *intf = nullptr; intf = dynamic_cast<be_interface*> (node->defined_in ()); decl = intf; } @@ -209,7 +209,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } @@ -222,7 +222,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) AST_Decl *d = si.item (); be_enum *e = dynamic_cast<be_enum*> (d); - if (e != 0) + if (e != nullptr) { be_visitor_enum_any_op_cs visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp index 41125edc8cd..09c1b95f3dc 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp @@ -66,7 +66,7 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node) AST_Decl *d = si.item (); be_enum *e = dynamic_cast<be_enum*> (d); - if (e != 0) + if (e != nullptr) { be_visitor_enum_cdr_op_ch visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp index 3e4cb98979b..bf306325ae5 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp @@ -43,7 +43,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node) AST_Decl *d = si.item (); be_enum *e = dynamic_cast<be_enum*> (d); - if (e != 0) + if (e != nullptr) { be_visitor_enum_cdr_op_cs visitor (&ctx); @@ -240,7 +240,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node) *os << "return result;" << be_uidt_nl << "}" << be_nl; - bool use_underscore = (this->ctx_->tdef () == 0); + bool use_underscore = (this->ctx_->tdef () == nullptr); if (be_global->gen_ostream_operators ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp index 6f354a6592a..05635017cbe 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp @@ -27,7 +27,7 @@ be_visitor_union_discriminant_ch::visit_enum (be_enum *node) // Get the enclosing union backend. be_union *bu = dynamic_cast<be_union*> (this->ctx_->node ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -82,7 +82,7 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type // get the enclosing union backend. be_union *bu = dynamic_cast<be_union*> (this->ctx_->node ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -125,6 +125,6 @@ be_visitor_union_discriminant_ch::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp index e2f058bf507..253e74a2590 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp @@ -26,7 +26,7 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node) { be_union *bu = dynamic_cast<be_union*> (this->ctx_->node ()); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -116,7 +116,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type ( be_union *bu = dynamic_cast<be_union*> (this->ctx_->node ()); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -235,6 +235,6 @@ be_visitor_union_discriminant_ci::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp index f18af597266..cd40472844f 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp @@ -27,7 +27,7 @@ be_visitor_union_discriminant_cs::visit_enum (be_enum *node) { be_union *bu = dynamic_cast<be_union*> (this->ctx_->node ()); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_union/union.cpp b/TAO/TAO_IDL/be/be_visitor_union/union.cpp index 0e1fd1a9960..52a9c702b14 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union.cpp @@ -165,7 +165,7 @@ be_visitor_union_cdr_op_cs::pre_process (be_decl *bd) dynamic_cast<be_union_branch*> (bd); // Could be a type decl. - if (b == 0) + if (b == nullptr) { return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp index fdadd8546de..6c12130958f 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp @@ -89,11 +89,11 @@ int be_visitor_union_cs::visit_union (be_union *node) *os << "this->disc_ = "; UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls); - be_union_branch *ub = 0; + be_union_branch *ub = nullptr; // In case we have some bogus enum values from an enum declared // in our scope. - while (ub == 0) + while (ub == nullptr) { // Just get the union's first member. AST_Decl *d = si.item (); diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp index 442fae3d029..1852db1bc2c 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp @@ -167,7 +167,7 @@ be_visitor_union_branch_cdr_op_ch::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp index 7d4654d9cd9..514515ff7d9 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp @@ -87,7 +87,7 @@ be_visitor_union_branch_cdr_op_cs::visit_array (be_array *node) be_union_branch *f = dynamic_cast<be_union_branch*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_cs::" @@ -187,7 +187,7 @@ be_visitor_union_branch_cdr_op_cs::visit_enum (be_enum *node) be_union_branch *f = dynamic_cast<be_union_branch*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_cs::" @@ -262,7 +262,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node) be_union_branch *f = dynamic_cast<be_union_branch*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_cs::" @@ -342,7 +342,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node) be_union_branch *f = dynamic_cast<be_union_branch*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_cs::" @@ -427,7 +427,7 @@ be_visitor_union_branch_cdr_op_cs::emit_valuetype_common (be_type *node) be_union_branch *f = dynamic_cast<be_union_branch*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_cs::" @@ -485,7 +485,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type ( be_union_branch *f = dynamic_cast<be_union_branch*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_cs::" @@ -673,7 +673,7 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node) be_union_branch *f = dynamic_cast<be_union_branch*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ci::" @@ -743,7 +743,7 @@ be_visitor_union_branch_cdr_op_cs::visit_string (be_string *node) be_union_branch *f = dynamic_cast<be_union_branch*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ci::" @@ -866,7 +866,7 @@ be_visitor_union_branch_cdr_op_cs::visit_structure (be_structure *node) be_union_branch *f = dynamic_cast<be_union_branch*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ci::" @@ -928,7 +928,7 @@ be_visitor_union_branch_cdr_op_cs::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -963,7 +963,7 @@ be_visitor_union_branch_cdr_op_cs::visit_union (be_union *node) be_union_branch *f = dynamic_cast<be_union_branch*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ci::" @@ -1028,7 +1028,7 @@ be_visitor_union_branch_cdr_op_cs::explicit_default (void) !si.is_done (); si.next ()) { - be_union_branch *bub = 0; // union branch node + be_union_branch *bub = nullptr; // union branch node AST_Decl *d = si.item (); diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp index 8eed1cecc00..502263e8f1c 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp @@ -63,7 +63,7 @@ be_visitor_union_branch_private_ch::visit_array (be_array *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -113,7 +113,7 @@ be_visitor_union_branch_private_ch::visit_enum (be_enum *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node if (this->ctx_->alias ()) @@ -152,7 +152,7 @@ be_visitor_union_branch_private_ch::visit_interface (be_interface *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node if (this->ctx_->alias ()) @@ -191,7 +191,7 @@ be_visitor_union_branch_private_ch::visit_interface_fwd (be_interface_fwd *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node if (this->ctx_->alias ()) @@ -230,7 +230,7 @@ be_visitor_union_branch_private_ch::visit_valuebox (be_valuebox *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node if (this->ctx_->alias ()) @@ -269,7 +269,7 @@ be_visitor_union_branch_private_ch::visit_valuetype (be_valuetype *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node if (this->ctx_->alias ()) @@ -308,7 +308,7 @@ be_visitor_union_branch_private_ch::visit_valuetype_fwd (be_valuetype_fwd *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node if (this->ctx_->alias ()) @@ -349,11 +349,11 @@ be_visitor_union_branch_private_ch::visit_predefined_type ( { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; be_typedef *td = this->ctx_->alias (); // Check if we are visiting this node via a visit to a typedef node - if (td != 0) + if (td != nullptr) { bt = td; } @@ -417,7 +417,7 @@ be_visitor_union_branch_private_ch::visit_sequence (be_sequence *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node if (this->ctx_->alias ()) @@ -492,7 +492,7 @@ be_visitor_union_branch_private_ch::visit_structure (be_structure *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node if (this->ctx_->alias ()) @@ -563,7 +563,7 @@ be_visitor_union_branch_private_ch::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -572,7 +572,7 @@ be_visitor_union_branch_private_ch::visit_union (be_union *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp index dff99270805..584f5733c91 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp @@ -125,7 +125,7 @@ be_visitor_union_branch_public_assign_cs::visit_array (be_array *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -198,7 +198,7 @@ be_visitor_union_branch_public_assign_cs::visit_enum (be_enum *) be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_assign_cs::" @@ -225,7 +225,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -322,7 +322,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd ( dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -437,7 +437,7 @@ be_visitor_union_branch_public_assign_cs::emit_valuetype_common (be_type *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -507,7 +507,7 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type ( dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -619,7 +619,7 @@ be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -685,7 +685,7 @@ be_visitor_union_branch_public_assign_cs::visit_string (be_string *node) be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_assign_cs::" @@ -720,7 +720,7 @@ be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -814,7 +814,7 @@ be_visitor_union_branch_public_assign_cs::visit_typedef (be_typedef *node) ), -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -825,7 +825,7 @@ be_visitor_union_branch_public_assign_cs::visit_union (be_union *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp index a9e96e188e9..21dfe6c92e0 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp @@ -62,7 +62,7 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -144,7 +144,7 @@ be_visitor_union_branch_public_ch::visit_enum (be_enum *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -206,7 +206,7 @@ be_visitor_union_branch_public_ch::visit_interface (be_interface *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -249,7 +249,7 @@ be_visitor_union_branch_public_ch::visit_interface_fwd (be_interface_fwd *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -292,7 +292,7 @@ be_visitor_union_branch_public_ch::visit_valuebox (be_valuebox *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -335,7 +335,7 @@ be_visitor_union_branch_public_ch::visit_valuetype (be_valuetype *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -378,7 +378,7 @@ be_visitor_union_branch_public_ch::visit_valuetype_fwd (be_valuetype_fwd *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -421,11 +421,11 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; be_typedef *td = this->ctx_->alias (); // Check if we are visiting this via a visit to a typedef node. - if (td != 0) + if (td != nullptr) { bt = td; } @@ -493,7 +493,7 @@ be_visitor_union_branch_public_ch::visit_sequence (be_sequence *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -611,7 +611,7 @@ be_visitor_union_branch_public_ch::visit_structure (be_structure *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -694,7 +694,7 @@ be_visitor_union_branch_public_ch::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -703,7 +703,7 @@ be_visitor_union_branch_public_ch::visit_union (be_union *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp index c6d85ab4ea4..59f85375335 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp @@ -66,7 +66,7 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -201,7 +201,7 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // heck if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -272,7 +272,7 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -362,7 +362,7 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -470,7 +470,7 @@ be_visitor_union_branch_public_ci::emit_valuetype_common (be_type *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -549,7 +549,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -761,7 +761,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -844,7 +844,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node) be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_ci::" @@ -1014,7 +1014,7 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -1170,7 +1170,7 @@ be_visitor_union_branch_public_ci::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -1181,7 +1181,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp index 75888dd093b..47d602193d7 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp @@ -69,7 +69,7 @@ be_visitor_union_branch_public_constructor_cs::visit_array (be_array *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -141,7 +141,7 @@ be_visitor_union_branch_public_constructor_cs::visit_predefined_type ( dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -187,7 +187,7 @@ be_visitor_union_branch_public_constructor_cs::visit_sequence (be_sequence *node dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -224,7 +224,7 @@ be_visitor_union_branch_public_constructor_cs::visit_structure (be_structure *no dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -285,7 +285,7 @@ be_visitor_union_branch_public_constructor_cs::visit_typedef (be_typedef *node) ), -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -296,7 +296,7 @@ be_visitor_union_branch_public_constructor_cs::visit_union (be_union *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp index 79bf8a03e1d..e8eaa9968e0 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp @@ -112,7 +112,7 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node) dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -123,7 +123,7 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node) bt = node; } - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -182,7 +182,7 @@ be_visitor_union_branch_public_reset_cs::visit_enum (be_enum *) be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -202,7 +202,7 @@ be_visitor_union_branch_public_reset_cs::visit_interface (be_interface *) be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -229,7 +229,7 @@ be_visitor_union_branch_public_reset_cs::visit_interface_fwd (be_interface_fwd * be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -257,7 +257,7 @@ be_visitor_union_branch_public_reset_cs::visit_valuebox ( be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -285,7 +285,7 @@ be_visitor_union_branch_public_reset_cs::visit_valuetype ( be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -313,7 +313,7 @@ be_visitor_union_branch_public_reset_cs::visit_valuetype_fwd ( be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -342,7 +342,7 @@ be_visitor_union_branch_public_reset_cs::visit_predefined_type ( be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -394,7 +394,7 @@ be_visitor_union_branch_public_reset_cs::visit_sequence ( be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -423,7 +423,7 @@ be_visitor_union_branch_public_reset_cs::visit_string ( be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -459,7 +459,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure ( dynamic_cast<be_union_branch*> (this->ctx_->node ()); be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - be_type *bt = 0; + be_type *bt = nullptr; if (this->ctx_->alias ()) { @@ -470,7 +470,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure ( bt = node; } - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -521,7 +521,7 @@ be_visitor_union_branch_public_reset_cs::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -534,7 +534,7 @@ be_visitor_union_branch_public_reset_cs::visit_union ( be_union *bu = dynamic_cast<be_union*> (this->ctx_->scope ()); - if (ub == 0 || bu == 0) + if (ub == nullptr || bu == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp index 78aea71a1dc..6507cad551c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp @@ -42,7 +42,7 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node) *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested () && node->defined_in ()->scope_node_type () == AST_Decl::NT_module) @@ -97,7 +97,7 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp index 73a9d99f761..1d8e0e0e39e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp @@ -67,7 +67,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) *os << be_global->core_versioning_end () << be_nl; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested () && node->defined_in ()->scope_node_type () == AST_Decl::NT_module) @@ -184,7 +184,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp index f3f9358ba5d..9168175a9a1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp @@ -64,7 +64,7 @@ int be_visitor_valuebox_field_ch::visit_array (be_array *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -137,7 +137,7 @@ int be_visitor_valuebox_field_ch::visit_enum (be_enum *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -173,7 +173,7 @@ int be_visitor_valuebox_field_ch::visit_interface (be_interface *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -209,7 +209,7 @@ int be_visitor_valuebox_field_ch::visit_interface_fwd (be_interface_fwd *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -259,7 +259,7 @@ int be_visitor_valuebox_field_ch::visit_predefined_type (be_predefined_type *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -312,7 +312,7 @@ int be_visitor_valuebox_field_ch::visit_sequence (be_sequence *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -350,7 +350,7 @@ int be_visitor_valuebox_field_ch::visit_string (be_string *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -401,7 +401,7 @@ int be_visitor_valuebox_field_ch::visit_structure (be_structure *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -451,7 +451,7 @@ be_visitor_valuebox_field_ch::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -459,7 +459,7 @@ int be_visitor_valuebox_field_ch::visit_union (be_union *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp index 30d21bb3b2a..662d0fd2b93 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp @@ -17,7 +17,7 @@ be_visitor_valuebox_field_ci::be_visitor_valuebox_field_ci ( be_visitor_context *ctx ) : be_visitor_decl (ctx), - vb_node_ (0) + vb_node_ (nullptr) { } @@ -63,7 +63,7 @@ int be_visitor_valuebox_field_ci::visit_array (be_array *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -151,7 +151,7 @@ int be_visitor_valuebox_field_ci::visit_enum (be_enum *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -188,7 +188,7 @@ int be_visitor_valuebox_field_ci::visit_interface (be_interface *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -234,7 +234,7 @@ int be_visitor_valuebox_field_ci::visit_interface_fwd (be_interface_fwd *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -308,7 +308,7 @@ int be_visitor_valuebox_field_ci::visit_predefined_type (be_predefined_type *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -370,7 +370,7 @@ int be_visitor_valuebox_field_ci::visit_sequence (be_sequence *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -407,7 +407,7 @@ int be_visitor_valuebox_field_ci::visit_string (be_string *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -465,7 +465,7 @@ int be_visitor_valuebox_field_ci::visit_structure (be_structure *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -513,7 +513,7 @@ be_visitor_valuebox_field_ci::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -521,7 +521,7 @@ int be_visitor_valuebox_field_ci::visit_union (be_union *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp index a0657150fc7..596313f333c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp @@ -17,7 +17,7 @@ be_visitor_valuebox_union_member_ci::be_visitor_valuebox_union_member_ci ( be_visitor_context *ctx ) : be_visitor_decl (ctx), - vb_node_ (0) + vb_node_ (nullptr) { } @@ -61,7 +61,7 @@ int be_visitor_valuebox_union_member_ci::visit_array (be_array *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -148,7 +148,7 @@ int be_visitor_valuebox_union_member_ci::visit_enum (be_enum *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -185,7 +185,7 @@ int be_visitor_valuebox_union_member_ci::visit_interface (be_interface *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -221,7 +221,7 @@ int be_visitor_valuebox_union_member_ci::visit_interface_fwd (be_interface_fwd *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -271,7 +271,7 @@ int be_visitor_valuebox_union_member_ci::visit_predefined_type (be_predefined_type *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -324,7 +324,7 @@ int be_visitor_valuebox_union_member_ci::visit_sequence (be_sequence *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -361,7 +361,7 @@ int be_visitor_valuebox_union_member_ci::visit_string (be_string *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -419,7 +419,7 @@ int be_visitor_valuebox_union_member_ci::visit_structure (be_structure *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -467,7 +467,7 @@ be_visitor_valuebox_union_member_ci::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -475,7 +475,7 @@ int be_visitor_valuebox_union_member_ci::visit_union (be_union *node) { be_decl *field = this->ctx_->node (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp index 6d64385f51c..f8b0beff227 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp @@ -270,7 +270,7 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) // generation for it. be_type *bt = dynamic_cast<be_type*> (node->base_type ()); - if (bt == 0) + if (bt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuebox_ch::" @@ -507,9 +507,9 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node) // member. These functions have the same signatures as // acessor and modifier functions for union members. - AST_Decl *d = 0; - AST_Field *field = 0; - be_type *bt = 0; + AST_Decl *d = nullptr; + AST_Field *field = nullptr; + be_type *bt = nullptr; be_visitor_context ctx (*this->ctx_); for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls); @@ -518,7 +518,7 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node) { d = si.item (); - if (d == 0 || (field = dynamic_cast<AST_Field*> (d)) == 0) + if (d == nullptr || (field = dynamic_cast<AST_Field*> (d)) == nullptr) { ACE_ERROR ((LM_ERROR, "(%N:%l) be_visitor_valuebox_ch::visit_structure -" @@ -608,9 +608,9 @@ be_visitor_valuebox_ch::visit_union (be_union *node) // Now generate the accessor and modifier functions for each union // member. - AST_Decl *d = 0; - AST_Field *field = 0; - be_type *bt = 0; + AST_Decl *d = nullptr; + AST_Field *field = nullptr; + be_type *bt = nullptr; be_visitor_context ctx (*this->ctx_); for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls); @@ -619,7 +619,7 @@ be_visitor_valuebox_ch::visit_union (be_union *node) { d = si.item (); - if (d == 0 || (field = dynamic_cast<AST_Field*> (d)) == 0) + if (d == nullptr || (field = dynamic_cast<AST_Field*> (d)) == nullptr) { ACE_ERROR ((LM_ERROR, "(%N:%l) be_visitor_valuebox_ch::visit_union -" diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp index 0df910222b4..6a3b47f6c10 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -426,7 +426,7 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node) { d = si.item (); - if (d == 0 || (field = dynamic_cast<be_field*> (d)) == 0) + if (d == nullptr || (field = dynamic_cast<be_field*> (d)) == nullptr) { ACE_ERROR ((LM_ERROR, "(%N:%l) be_visitor_valuebox_cs::visit_structure -" @@ -508,7 +508,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node) { d = si.item (); - if (d == 0 || (member = dynamic_cast<be_union_branch*> (d)) == 0) + if (d == nullptr || (member = dynamic_cast<be_union_branch*> (d)) == nullptr) { ACE_ERROR ((LM_ERROR, "(%N:%l) be_visitor_valuebox_ci::visit_union -" @@ -534,7 +534,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node) // Retrieve the disriminant type. - be_type *bt = 0; + be_type *bt = nullptr; bt = dynamic_cast<be_type*> (node->disc_type ()); if (!bt) diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp index dd45e8f2e41..06ffc055f80 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -180,7 +180,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) const char * unmarshal_arg; be_predefined_type *bpt = dynamic_cast<be_predefined_type*> (bt); - if (bpt != 0) + if (bpt != nullptr) { switch (bpt->pt()) { @@ -214,7 +214,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) unmarshal_arg = "vb_object->_pd_value"; } } - else if (dynamic_cast<be_array*> (bt) != 0) + else if (dynamic_cast<be_array*> (bt) != nullptr) { is_array = true; unmarshal_arg = "temp"; @@ -271,7 +271,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) *os << "return (strm >> "; be_string *str = dynamic_cast<be_string*> (bt); - if (str != 0 && + if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0) { if (str->width () == (long) sizeof (char)) @@ -450,7 +450,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) // generation for it. be_type *bt = dynamic_cast<be_type*> (node->base_type ()); - if (bt == 0) + if (bt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuebox_cs::" diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp index 77e138be8ab..cec1cc66c62 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp @@ -42,7 +42,7 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node) *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested () && node->defined_in ()->scope_node_type () == AST_Decl::NT_module) @@ -97,7 +97,7 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp index 509937c55fa..a0c513724b9 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp @@ -66,7 +66,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) *os << be_global->core_versioning_end () << be_nl; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested () && node->defined_in ()->scope_node_type () == AST_Decl::NT_module) @@ -202,7 +202,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp index a633699f97d..699fac6e888 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp @@ -35,13 +35,13 @@ be_visitor_obv_operation_arglist::is_amh_exception_holder (be_operation *node) UTL_Scope *scope = node->defined_in (); be_interface *iface = dynamic_cast<be_interface*> (scope); - if (iface != 0) + if (iface != nullptr) { if (ACE_OS::strncmp (iface->local_name (), "AMH_", 4) == 0) { const char *last_E = ACE_OS::strrchr (iface->full_name (), 'E'); - if (last_E != 0 + if (last_E != nullptr && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0) { return true; @@ -124,13 +124,13 @@ be_visitor_obv_operation_arglist::visit_argument (be_argument *node) dynamic_cast<be_operation*> (this->ctx_->node ()); // Sometimes the operation is stored in the context scope instead. - if (op == 0) + if (op == nullptr) { op = dynamic_cast<be_operation*> (this->ctx_->scope ()); } - if (op == 0) + if (op == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_arglist::" diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp index f3106b00fe9..bcef3b7a8c0 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp @@ -129,7 +129,7 @@ be_visitor_valuetype_cdr_op_cs::visit_field (be_field *node) { be_type *bt = dynamic_cast<be_type*> (node->field_type ()); - if (bt == 0) + if (bt == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_ci::" diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp index 4f38613afac..550f1edfc43 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp @@ -175,7 +175,7 @@ be_visitor_valuetype_field_cdr_ch::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp index 9af6e532cc5..2c395d126f6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp @@ -65,7 +65,7 @@ be_visitor_valuetype_field_cdr_cs::visit_array (be_array *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -170,7 +170,7 @@ be_visitor_valuetype_field_cdr_cs::visit_enum (be_enum *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -232,7 +232,7 @@ be_visitor_valuetype_field_cdr_cs::visit_interface (be_interface *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -282,7 +282,7 @@ be_visitor_valuetype_field_cdr_cs::visit_interface_fwd (be_interface_fwd *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -338,7 +338,7 @@ be_visitor_valuetype_field_cdr_cs::valuetype_common (be_type *) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -390,7 +390,7 @@ be_visitor_valuetype_field_cdr_cs::visit_valuetype_fwd (be_valuetype_fwd *) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -460,7 +460,7 @@ be_visitor_valuetype_field_cdr_cs::visit_predefined_type (be_predefined_type *no be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -565,7 +565,7 @@ be_visitor_valuetype_field_cdr_cs::visit_sequence (be_sequence *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -630,7 +630,7 @@ be_visitor_valuetype_field_cdr_cs::visit_string (be_string *str) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -644,7 +644,7 @@ be_visitor_valuetype_field_cdr_cs::visit_string (be_string *str) switch (this->ctx_->sub_state ()) { case TAO_CodeGen::TAO_CDR_INPUT: - if (str != 0 && str->max_size ()->ev ()->u.ulval != 0) + if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0) { if (str->width () == (long) sizeof (char)) { @@ -666,7 +666,7 @@ be_visitor_valuetype_field_cdr_cs::visit_string (be_string *str) } break; case TAO_CodeGen::TAO_CDR_OUTPUT: - if (str != 0 && str->max_size ()->ev ()->u.ulval != 0) + if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0) { if (str->width () == (long) sizeof (char)) { @@ -712,7 +712,7 @@ be_visitor_valuetype_field_cdr_cs::visit_structure ( be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -782,7 +782,7 @@ be_visitor_valuetype_field_cdr_cs::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -795,7 +795,7 @@ be_visitor_valuetype_field_cdr_cs::visit_union (be_union *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -904,7 +904,7 @@ be_visitor_valuetype_field_cdr_decl::visit_array (be_array *node) be_field *f = dynamic_cast<be_field*> (this->ctx_->node ()); - if (f == 0) + if (f == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_decl::" @@ -1006,6 +1006,6 @@ be_visitor_valuetype_field_cdr_decl::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp index bdd7fdb7cfa..fa9b36507f9 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp @@ -63,7 +63,7 @@ be_visitor_valuetype_field_ch::visit_array (be_array *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -146,7 +146,7 @@ be_visitor_valuetype_field_ch::visit_enum (be_enum *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -205,7 +205,7 @@ be_visitor_valuetype_field_ch::visit_interface (be_interface *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -248,7 +248,7 @@ be_visitor_valuetype_field_ch::visit_interface_fwd (be_interface_fwd *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -291,7 +291,7 @@ be_visitor_valuetype_field_ch::visit_valuebox (be_valuebox *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -334,7 +334,7 @@ be_visitor_valuetype_field_ch::visit_valuetype (be_valuetype *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -383,7 +383,7 @@ be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -432,7 +432,7 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -506,7 +506,7 @@ be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -647,7 +647,7 @@ be_visitor_valuetype_field_ch::visit_structure (be_structure *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) @@ -723,7 +723,7 @@ be_visitor_valuetype_field_ch::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -732,7 +732,7 @@ be_visitor_valuetype_field_ch::visit_union (be_union *node) { be_decl *ub = this->ctx_->node (); be_decl *bu = this->ctx_->scope ()->decl (); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this via a visit to a typedef node. if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp index 261508bd9ba..2e948be0cee 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp @@ -62,7 +62,7 @@ be_visitor_valuetype_field_ci::visit_array (be_array *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -109,7 +109,7 @@ be_visitor_valuetype_field_ci::visit_structure (be_structure *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -156,7 +156,7 @@ be_visitor_valuetype_field_ci::visit_union (be_union *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp index a33196f905d..eb3c29909c8 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp @@ -61,7 +61,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -191,7 +191,7 @@ be_visitor_valuetype_field_cs::visit_enum (be_enum *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -260,7 +260,7 @@ be_visitor_valuetype_field_cs::visit_interface (be_interface *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -329,7 +329,7 @@ be_visitor_valuetype_field_cs::visit_interface_fwd (be_interface_fwd *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -403,7 +403,7 @@ be_visitor_valuetype_field_cs::valuetype_common (be_type *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -484,7 +484,7 @@ be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -560,7 +560,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -718,7 +718,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -959,7 +959,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) @@ -1066,7 +1066,7 @@ be_visitor_valuetype_field_cs::visit_typedef (be_typedef *node) -1); } - this->ctx_->alias (0); + this->ctx_->alias (nullptr); return 0; } @@ -1076,7 +1076,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node) be_decl *ub = this->ctx_->node (); be_valuetype *bu = dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ()); - be_type *bt = 0; + be_type *bt = nullptr; // Check if we are visiting this node via a visit to a typedef node. if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp index e8a0068182c..1185a0c88ea 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp @@ -42,7 +42,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node) // If the valuetype has no fields, and no stateful inherit, // the stream arg is unused. - if (inh != 0 || node->data_members_count () > 0) + if (inh != nullptr || node->data_members_count () > 0) { *os << "strm"; } @@ -50,7 +50,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node) *os << ", TAO_ChunkInfo&"; // If the valuetype has no fields, and no stateful inherit, // the chunking helper arg is unused. - if (inh != 0 || node->data_members_count () > 0) + if (inh != nullptr || node->data_members_count () > 0) { *os << "ci"; } @@ -137,7 +137,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node) // If the valuetype has no fields, and no stateful inherit, // the stream arg is unused. - if (inh != 0 || node->data_members_count () > 0) + if (inh != nullptr || node->data_members_count () > 0) { *os << "strm"; } @@ -145,7 +145,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node) *os << ", TAO_ChunkInfo&"; // If the valuetype has no fields, and no stateful inherit, // the chunking helper arg is unused. - if (inh != 0 || node->data_members_count () > 0) + if (inh != nullptr || node->data_members_count () > 0) { *os << "ci"; } @@ -281,7 +281,7 @@ be_visitor_valuetype_marshal_cs::gen_fields (be_valuetype *node, be_field *field = dynamic_cast<be_field*> (d); - if (field != 0 && attr == 0) + if (field != nullptr && attr == nullptr) { if (n_processed > 0) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index 62f092fc062..d20a5668def 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -50,7 +50,7 @@ be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node) AST_Field *field = dynamic_cast<AST_Field*> (d); - if (field != 0 && field->visibility () == AST_Field::vis_PRIVATE) + if (field != nullptr && field->visibility () == AST_Field::vis_PRIVATE) { this->begin_private (); } @@ -59,7 +59,7 @@ be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node) this->begin_public (); } - if (bd == 0 || bd->accept (this) == -1) + if (bd == nullptr || bd->accept (this) == -1) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_scope::visit_scope - " @@ -121,7 +121,7 @@ be_visitor_valuetype::visit_attribute (be_attribute *node) Identifier id ("void"); UTL_ScopedName sn (&id, - 0); + nullptr); be_predefined_type rt (AST_PredefinedType::PT_void, &sn); @@ -684,7 +684,7 @@ be_visitor_valuetype::gen_pd (be_valuetype *node) be_field *field = dynamic_cast<be_field*> (d); be_attribute *attr = dynamic_cast<be_attribute*> (d); - if (field == 0 || attr != 0) + if (field == nullptr || attr != nullptr) { continue; } @@ -764,7 +764,7 @@ be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node, AST_Type *parent = node->inherits_concrete (); // Generate for inherited members first. - if (parent != 0) + if (parent != nullptr) { be_valuetype *be_parent = dynamic_cast<be_valuetype*> (parent); @@ -784,7 +784,7 @@ be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node, be_attribute *attr = dynamic_cast<be_attribute*> (si.item ()); - if (f == 0 || attr != 0) + if (f == nullptr || attr != nullptr) { continue; } @@ -794,7 +794,7 @@ be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node, ACE_CString arg_name ("_tao_init_"); arg_name += f->local_name ()->get_string (); Identifier id (arg_name.c_str ()); - UTL_ScopedName sn (&id, 0); + UTL_ScopedName sn (&id, nullptr); be_type *ft = dynamic_cast<be_type*> (f->field_type ()); bool seen = ft->seen_in_operation (); @@ -902,7 +902,7 @@ be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node) be_valuetype *vt = dynamic_cast<be_valuetype*> (node->inherits ()[i]); - if (vt != 0) + if (vt != nullptr) { if (be_visitor_valuetype::obv_have_ref_counter (vt)) { @@ -934,7 +934,7 @@ be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node) { // Just try to find a VT with concrete factory in inheritance tree. - if (node == 0) + if (node == nullptr) { return false; } @@ -949,7 +949,7 @@ be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node) { be_valuetype *vt = dynamic_cast<be_valuetype*> (node->inherits ()[i]); - if (vt != 0) + if (vt != nullptr) { if (be_visitor_valuetype::obv_have_ref_counter (vt)) { @@ -969,7 +969,7 @@ be_visitor_valuetype::is_amh_exception_holder (be_valuetype *node) const char *last_E = ACE_OS::strrchr (node->full_name (), 'E'); - if (last_E != 0 + if (last_E != nullptr && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0) { return true; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index 4984e3448d9..9461007b1c6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -67,7 +67,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *os << be_idt_nl << ": " << be_idt; long i; // loop index - be_valuetype *inherited = 0; + be_valuetype *inherited = nullptr; long n_inherits = node->n_inherits (); int inherits_eventtype = 0; @@ -88,7 +88,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *os << "," << be_nl; } - be_decl *scope = 0; + be_decl *scope = nullptr; if (inherited->is_nested ()) { @@ -498,7 +498,7 @@ be_visitor_valuetype_ch::gen_supported_ops (be_interface *, TAO_OutStream *os) { - AST_Decl *d = 0; + AST_Decl *d = nullptr; be_visitor_context ctx; ctx.stream (os); @@ -508,7 +508,7 @@ be_visitor_valuetype_ch::gen_supported_ops (be_interface *, { d = si.item (); - if (d == 0) + if (d == nullptr) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_valuetype_ch::") diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index bf6630e78ad..97f51289688 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -409,7 +409,7 @@ be_visitor_valuetype_cs::visit_operation (be_operation *node) be_valuetype *parent = dynamic_cast<be_valuetype*> (node->defined_in ()); - if (parent == 0 || ! this->is_amh_exception_holder (parent)) + if (parent == nullptr || ! this->is_amh_exception_holder (parent)) { return 0; } @@ -489,7 +489,7 @@ be_visitor_valuetype_cs::gen_ostream_operator_r (be_valuetype *node, AST_Type *parent = node->inherits_concrete (); // Recurse up the parent chain. - if (parent != 0) + if (parent != nullptr) { this->gen_ostream_operator_r (dynamic_cast<be_valuetype*> (parent), index); @@ -505,9 +505,9 @@ be_visitor_valuetype_cs::gen_ostream_operator_r (be_valuetype *node, dynamic_cast<be_attribute*> (i.item ()); // No way to access the private members from generated code. - if (f == 0 + if (f == nullptr || f->visibility () != AST_Field::vis_PUBLIC - || attr != 0) + || attr != nullptr) { continue; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp index 879f325fb37..2c9d57c00e3 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp @@ -92,7 +92,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) // int i = 0; - AST_Type *inherited = 0; + AST_Type *inherited = nullptr; for (; i < node->n_inherits (); ++i) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp index 14f9a18fead..4ad375c6f6b 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp @@ -214,7 +214,7 @@ be_visitor_valuetype_obv_cs::gen_obv_init_base_constructor_args ( AST_Type *parent = node->inherits_concrete (); // Generate for inherited members first. - if (parent != 0) + if (parent != nullptr) { be_valuetype *be_parent = dynamic_cast<be_valuetype*> (parent); @@ -231,7 +231,7 @@ be_visitor_valuetype_obv_cs::gen_obv_init_base_constructor_args ( be_attribute *attr = dynamic_cast<be_attribute*> (si.item ()); - if (f == 0 || attr != 0) + if (f == nullptr || attr != nullptr) { continue; } @@ -250,7 +250,7 @@ be_visitor_valuetype_obv_cs::gen_obv_init_constructor_inits ( AST_Type *parent = node->inherits_concrete (); // Generate for inherited members first. - if (parent != 0) + if (parent != nullptr) { be_valuetype *be_parent = dynamic_cast<be_valuetype*> (parent); this->gen_obv_init_constructor_inits (be_parent); @@ -266,7 +266,7 @@ be_visitor_valuetype_obv_cs::gen_obv_init_constructor_inits ( be_attribute *attr = dynamic_cast<be_attribute*> (si.item ()); - if (f == 0 || attr != 0) + if (f == nullptr || attr != nullptr) { continue; } @@ -287,7 +287,7 @@ be_visitor_valuetype_obv_cs::gen_obv_call_base_constructor_args ( // Generate for inherited members first. AST_Type *parent = node->inherits_concrete (); - if (parent != 0) + if (parent != nullptr) { be_valuetype *be_parent = dynamic_cast<be_valuetype*> (parent); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp index 6f61bfdb30e..d570cfbe4ea 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp @@ -36,7 +36,7 @@ be_visitor_valuetype_sh::visit_valuetype (be_valuetype *node) // We generate a skeleton class only if the valuetype supports a // non-abstract interface. - if (concrete == 0) + if (concrete == nullptr) { return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp index bbfe3041e28..cb9cbde63b5 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp @@ -37,7 +37,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node) // We generate a skeleton class only if the valuetype supports a // non-abstract interface. - if (concrete == 0) + if (concrete == nullptr) { return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp index e6f07f9dc13..5fedde1a55a 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp @@ -54,7 +54,7 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; - be_module *module = 0; + be_module *module = nullptr; if (node->is_nested () && node->defined_in ()->scope_node_type () == AST_Decl::NT_module) @@ -110,7 +110,7 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( << node->name () << " *&);"; *os << be_global->core_versioning_end () << be_nl; - if (module != 0) + if (module != nullptr) { *os << "\n\n#endif"; } diff --git a/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp index 10e49e6f12a..d09210817b9 100644 --- a/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp @@ -44,8 +44,8 @@ be_visitor_xplicit_pre_proc::be_visitor_xplicit_pre_proc ( be_visitor_context *ctx) : be_visitor_ccm_pre_proc (ctx), - xplicit_ (0), - type_holder_ (0), + xplicit_ (nullptr), + type_holder_ (nullptr), ref_type_ (false) { } @@ -59,7 +59,7 @@ be_visitor_xplicit_pre_proc::visit_home (be_home *node) { UTL_NameList *parent_list = this->compute_inheritance (node); - FE_InterfaceHeader header (0, + FE_InterfaceHeader header (nullptr, parent_list, false, false, @@ -80,7 +80,7 @@ be_visitor_xplicit_pre_proc::visit_home (be_home *node) "Explicit", m); - be_interface *i = 0; + be_interface *i = nullptr; ACE_NEW_RETURN (i, be_interface (explicit_name, header.inherits (), @@ -115,13 +115,13 @@ be_visitor_xplicit_pre_proc::visit_home (be_home *node) explicit_name->destroy (); delete explicit_name; - explicit_name = 0; + explicit_name = nullptr; header.destroy (); parent_list->destroy (); delete parent_list; - parent_list = 0; + parent_list = nullptr; // Through with the scope containing the home. idl_global->scopes ().pop (); @@ -134,9 +134,9 @@ be_visitor_xplicit_pre_proc::visit_home (be_home *node) int be_visitor_xplicit_pre_proc::visit_operation (be_operation *node) { - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); - be_operation *home_op = 0; + be_operation *home_op = nullptr; ACE_NEW_RETURN (home_op, be_operation (node->return_type (), node->flags (), @@ -146,7 +146,7 @@ be_visitor_xplicit_pre_proc::visit_operation (be_operation *node) -1); UTL_ExceptList *excep_list = node->exceptions (); - if (0 != excep_list) + if (nullptr != excep_list) { home_op->be_add_exceptions (excep_list->copy ()); } @@ -171,7 +171,7 @@ be_visitor_xplicit_pre_proc::visit_operation (be_operation *node) int be_visitor_xplicit_pre_proc::visit_argument (be_argument *node) { - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); this->ref_type_ = true; @@ -192,7 +192,7 @@ be_visitor_xplicit_pre_proc::visit_argument (be_argument *node) AST_Type *arg_type = dynamic_cast<AST_Type*> (this->type_holder_); - be_argument *added_arg = 0; + be_argument *added_arg = nullptr; ACE_NEW_RETURN (added_arg, be_argument (node->direction (), arg_type, @@ -207,12 +207,12 @@ be_visitor_xplicit_pre_proc::visit_argument (be_argument *node) int be_visitor_xplicit_pre_proc::visit_factory (be_factory *node) { - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); AST_Home *f_home = dynamic_cast<AST_Home*> (node->defined_in ()); - be_operation *added_factory = 0; + be_operation *added_factory = nullptr; ACE_NEW_RETURN (added_factory, be_operation (f_home->managed_component (), AST_Operation::OP_noflags, @@ -241,12 +241,12 @@ be_visitor_xplicit_pre_proc::visit_factory (be_factory *node) int be_visitor_xplicit_pre_proc::visit_finder (be_finder *node) { - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); AST_Home *f_home = dynamic_cast<AST_Home*> (node->defined_in ()); - be_operation *added_finder = 0; + be_operation *added_finder = nullptr; ACE_NEW_RETURN (added_finder, be_operation (f_home->managed_component (), AST_Operation::OP_noflags, @@ -321,9 +321,9 @@ be_visitor_xplicit_pre_proc::visit_structure (be_structure *node) return 0; } - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); - be_structure *added_struct = 0; + be_structure *added_struct = nullptr; ACE_NEW_RETURN (added_struct, be_structure (&sn, false, @@ -349,16 +349,16 @@ int be_visitor_xplicit_pre_proc::visit_structure_fwd ( be_structure_fwd *node) { - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); - be_structure *dummy = 0; + be_structure *dummy = nullptr; ACE_NEW_RETURN (dummy, be_structure (&sn, false, false), -1); - be_structure_fwd *added_struct_fwd = 0; + be_structure_fwd *added_struct_fwd = nullptr; ACE_NEW_RETURN (added_struct_fwd, be_structure_fwd (dummy, &sn), @@ -374,9 +374,9 @@ be_visitor_xplicit_pre_proc::visit_structure_fwd ( int be_visitor_xplicit_pre_proc::visit_exception (be_exception *node) { - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); - be_exception *added_excep = 0; + be_exception *added_excep = nullptr; ACE_NEW_RETURN (added_excep, be_exception (&sn, false, @@ -409,9 +409,9 @@ be_visitor_xplicit_pre_proc::visit_enum (be_enum *node) return 0; } - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); - be_enum *added_enum = 0; + be_enum *added_enum = nullptr; ACE_NEW_RETURN (added_enum, be_enum (&sn, false, @@ -452,11 +452,11 @@ be_visitor_xplicit_pre_proc::visit_field (be_field *node) this->ref_type_ = false; - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); AST_Type *field_type = dynamic_cast<AST_Type*> (this->type_holder_); - be_field *added_field = 0; + be_field *added_field = nullptr; ACE_NEW_RETURN (added_field, be_field (field_type, &sn, @@ -490,9 +490,9 @@ be_visitor_xplicit_pre_proc::visit_attribute (be_attribute *node) AST_Type *attr_type = dynamic_cast<AST_Type*> (this->type_holder_); - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); - be_attribute *added_attr = 0; + be_attribute *added_attr = nullptr; ACE_NEW_RETURN (added_attr, be_attribute (node->readonly (), attr_type, @@ -534,9 +534,9 @@ be_visitor_xplicit_pre_proc::visit_union (be_union *node) AST_ConcreteType *disc = dynamic_cast<AST_ConcreteType*> (this->type_holder_); - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); - be_union *added_union = 0; + be_union *added_union = nullptr; ACE_NEW_RETURN (added_union, be_union (disc, &sn, @@ -562,17 +562,17 @@ be_visitor_xplicit_pre_proc::visit_union (be_union *node) int be_visitor_xplicit_pre_proc::visit_union_fwd (be_union_fwd *node) { - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); - be_union *dummy = 0; + be_union *dummy = nullptr; ACE_NEW_RETURN (dummy, - be_union (0, + be_union (nullptr, &sn, false, false), -1); - be_union_fwd *added_union_fwd = 0; + be_union_fwd *added_union_fwd = nullptr; ACE_NEW_RETURN (added_union_fwd, be_union_fwd (dummy, &sn), @@ -608,12 +608,12 @@ be_visitor_xplicit_pre_proc::visit_union_branch ( AST_Type *bt = dynamic_cast<AST_Type*> (this->type_holder_); - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); // The union branch owns its label list so we have to copy it. UTL_LabelList *ll = node->labels ()->copy (); - be_union_branch *added_branch = 0; + be_union_branch *added_branch = nullptr; ACE_NEW_RETURN (added_branch, be_union_branch (ll, bt, &sn), -1); @@ -644,15 +644,15 @@ be_visitor_xplicit_pre_proc::visit_constant (be_constant *node) return 0; } - AST_Expression *new_v = 0; + AST_Expression *new_v = nullptr; ACE_NEW_RETURN (new_v, AST_Expression (node->constant_value (), node->et ()), -1); - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); - be_constant *added_const = 0; + be_constant *added_const = nullptr; ACE_NEW_RETURN (added_const, be_constant (node->et (), new_v, @@ -673,9 +673,9 @@ be_visitor_xplicit_pre_proc::visit_enum_val (be_enum_val *node) return 0; } - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); - be_enum_val *added_enum_val = 0; + be_enum_val *added_enum_val = nullptr; ACE_NEW_RETURN (added_enum_val, be_enum_val (node->constant_value ()->ev ()->u.ulval, &sn), @@ -706,8 +706,8 @@ be_visitor_xplicit_pre_proc::visit_array (be_array *node) this->ref_type_ = tmp; - AST_Expression *v = 0; - UTL_ExprList *v_list = 0; + AST_Expression *v = nullptr; + UTL_ExprList *v_list = nullptr; for (ACE_CDR::ULong i = 0; i < node->n_dims (); ++i) { @@ -716,12 +716,12 @@ be_visitor_xplicit_pre_proc::visit_array (be_array *node) AST_Expression::EV_ulong), -1); - UTL_ExprList *el = 0; + UTL_ExprList *el = nullptr; ACE_NEW_RETURN (el, - UTL_ExprList (v, 0), + UTL_ExprList (v, nullptr), -1); - if (v_list == 0) + if (v_list == nullptr) { v_list = el; } @@ -731,9 +731,9 @@ be_visitor_xplicit_pre_proc::visit_array (be_array *node) } } - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); - be_array *added_array = 0; + be_array *added_array = nullptr; ACE_NEW_RETURN (added_array, be_array (&sn, node->n_dims (), @@ -745,11 +745,11 @@ be_visitor_xplicit_pre_proc::visit_array (be_array *node) // No need to add this new node to any scope - it's anonymous // and owned by the node that references it. - if (v_list != 0) + if (v_list != nullptr) { v_list->destroy (); delete v_list; - v_list = 0; + v_list = nullptr; } AST_Type *base_type = @@ -784,14 +784,14 @@ be_visitor_xplicit_pre_proc::visit_sequence (be_sequence *node) AST_Expression *v = node->max_size (); - AST_Expression *bound = 0; + AST_Expression *bound = nullptr; ACE_NEW_RETURN (bound, AST_Expression (v, AST_Expression::EV_ulong), -1); Identifier id ("sequence"); - UTL_ScopedName sn (&id, 0); + UTL_ScopedName sn (&id, nullptr); AST_Type *ft = dynamic_cast<AST_Type*> (this->type_holder_); @@ -827,14 +827,14 @@ be_visitor_xplicit_pre_proc::visit_string (be_string *node) return 0; } - AST_Expression *bound = 0; + AST_Expression *bound = nullptr; ACE_NEW_RETURN (bound, AST_Expression (b, AST_Expression::EV_ulong), -1); Identifier id ("string"); - UTL_ScopedName sn (&id, 0); + UTL_ScopedName sn (&id, nullptr); ACE_NEW_RETURN (this->type_holder_, be_string (AST_Decl::NT_string, @@ -871,11 +871,11 @@ be_visitor_xplicit_pre_proc::visit_typedef (be_typedef *node) this->ref_type_ = false; - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); AST_Type *bt = dynamic_cast<AST_Type*> (this->type_holder_); - be_typedef *added_typedef = 0; + be_typedef *added_typedef = nullptr; ACE_NEW_RETURN (added_typedef, be_typedef (bt, &sn, @@ -897,9 +897,9 @@ be_visitor_xplicit_pre_proc::visit_native (be_native *node) return 0; } - UTL_ScopedName sn (node->local_name (), 0); + UTL_ScopedName sn (node->local_name (), nullptr); - be_native *added_native = 0; + be_native *added_native = nullptr; ACE_NEW_RETURN (added_native, be_native (&sn), -1); @@ -930,7 +930,7 @@ be_visitor_xplicit_pre_proc::check_and_store (AST_Decl *node) UTL_ScopedName *tmpl_tail = this->xplicit_iface_rel_name (node); - if (tmpl_tail != 0) + if (tmpl_tail != nullptr) { AST_Decl *d = idl_global->scopes ().top ()->lookup_by_name ( @@ -941,7 +941,7 @@ be_visitor_xplicit_pre_proc::check_and_store (AST_Decl *node) tmpl_tail->destroy (); delete tmpl_tail; - tmpl_tail = 0; + tmpl_tail = nullptr; } else { @@ -955,9 +955,9 @@ be_visitor_xplicit_pre_proc::xplicit_iface_rel_name (AST_Decl *d) AST_Decl *tmp = d; ACE_CString name (d->full_name ()); - while (tmp != 0) + while (tmp != nullptr) { - if (dynamic_cast<be_home*> (tmp) != 0) + if (dynamic_cast<be_home*> (tmp) != nullptr) { ACE_CString head (tmp->local_name ()->get_string ()); @@ -971,5 +971,5 @@ be_visitor_xplicit_pre_proc::xplicit_iface_rel_name (AST_Decl *d) tmp = ScopeAsDecl (tmp->defined_in ()); } - return 0; + return nullptr; } |