1 files changed, 11 insertions, 11 deletions

diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp
index 7090dea4d03..e4922fb4a7d 100644
--- a/TAO/tao/HTTP_Parser.cpp
+++ b/TAO/tao/HTTP_Parser.cpp
@@ -18,7 +18,7 @@ static const ACE_TCHAR file_prefix[] = ACE_TEXT ("http:");
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_HTTP_Parser::~TAO_HTTP_Parser (void)
+TAO_HTTP_Parser::~TAO_HTTP_Parser ()
 {
 }
 
@@ -42,9 +42,9 @@ TAO_HTTP_Parser::parse_string (const char *nior,
   const ACE_TCHAR *http_url =
     ior.c_str () + sizeof (::file_prefix) + 1;
 
-  ACE_TCHAR *hostname = 0;
-  ACE_TCHAR *filename = 0;
-  const ACE_TCHAR *ptr = 0;
+  ACE_TCHAR *hostname = nullptr;
+  ACE_TCHAR *filename = nullptr;
+  const ACE_TCHAR *ptr = nullptr;
   u_short port = 80;
 
   if (http_url[0] == '/')
@@ -60,11 +60,11 @@ TAO_HTTP_Parser::parse_string (const char *nior,
         ptr = ACE_OS::strstr (http_url, ACE_TEXT ("/"));
 
     if(!ptr)
-      return 0;
+      return nullptr;
     else
     {
       size_t const host_len = ptr - http_url;
-      ACE_NEW_RETURN (hostname, ACE_TCHAR [host_len + 1], 0 );
+      ACE_NEW_RETURN (hostname, ACE_TCHAR [host_len + 1], nullptr );
       ACE_OS::strncpy (hostname, http_url, host_len);
       hostname [host_len] = '\0';
       ptr = ACE_OS::strstr (ptr, ACE_TEXT ("/"));
@@ -75,12 +75,12 @@ TAO_HTTP_Parser::parse_string (const char *nior,
       else
       {
         delete [] hostname;
-        return 0;
+        return nullptr;
       }
     }
   }
 
-  ACE_Message_Block* mb = 0;
+  ACE_Message_Block* mb = nullptr;
   ACE_NEW_THROW_EX (mb,
                     ACE_Message_Block (),
                     CORBA::INTERNAL ());
@@ -101,7 +101,7 @@ TAO_HTTP_Parser::parse_string (const char *nior,
                    port) == -1)
   {
       client.close ();
-      return 0;
+      return nullptr;
   }
 
   delete [] hostname;
@@ -111,13 +111,13 @@ TAO_HTTP_Parser::parse_string (const char *nior,
   if (client.read (mb) <= 0)
   {
       client.close ();
-      return 0;
+      return nullptr;
   }
 
   // We get multiple message blocks back, concatenate them to
   // one large string
   ACE_CString string;
-  for (ACE_Message_Block * curr = mb; curr != 0; curr = curr->cont ())
+  for (ACE_Message_Block * curr = mb; curr != nullptr; curr = curr->cont ())
     string += curr->rd_ptr();
 
   return orb->string_to_object (string.c_str());