Merge pull request #1327 from jwillemsen/jwi-taoidlnullptr2

Use nullptr instead of 0 in tao_idl

1 files changed, 7 insertions, 7 deletions

diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
index 674d63dbdf4..99dea8cd83e 100644
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO/TAO_IDL/ast/ast_constant.cpp
@@ -119,7 +119,7 @@ AST_Constant::exprtype_to_string (AST_Expression::ExprType et)
       break;
     }
 
-  return 0;
+  return nullptr;
 }
 
 AST_Decl::NodeType const
@@ -201,11 +201,11 @@ AST_Constant::ast_accept (ast_visitor *visitor)
 void
 AST_Constant::destroy (void)
 {
-  if (this->pd_constant_value != 0)
+  if (this->pd_constant_value != nullptr)
     {
       this->pd_constant_value->destroy ();
       delete this->pd_constant_value;
-      this->pd_constant_value = 0;
+      this->pd_constant_value = nullptr;
     }
 
   this->AST_Decl::destroy ();
@@ -277,10 +277,10 @@ AST_Constant::exprtype_to_string (void)
     case AST_Expression::EV_fixed:
       return "Fixed";
     default:
-      return 0;
+      return nullptr;
     }
 
-  return 0;
+  return nullptr;
 }
 
 UTL_ScopedName *
@@ -291,10 +291,10 @@ AST_Constant::enum_full_name (void)
       UTL_Scope * const s = this->defined_in ();
       AST_Decl  * const d = s->lookup_by_name (this->pd_constant_value->n (),
                                                1);
-      return (d ? (ScopeAsDecl (d->defined_in ()))->name () : 0);
+      return (d ? (ScopeAsDecl (d->defined_in ()))->name () : nullptr);
     }
   else
     {
-      return 0;
+      return nullptr;
     }
 }