ChangeLogTag: Wed Oct 13 06:53:55 2004 Olli Savia <ops@iki.fi>

7 files changed, 22 insertions, 22 deletions

diff --git a/tests/DLL_Test_Impl.cpp b/tests/DLL_Test_Impl.cpp
index 7fbf681ec17..133d15295ef 100644
--- a/tests/DLL_Test_Impl.cpp
+++ b/tests/DLL_Test_Impl.cpp
@@ -86,7 +86,7 @@ get_hello (void)
 
   ACE_NEW_RETURN (hello,
                   Hello_Impl,
-                  NULL);
+                  0);
 
   return hello;
 }
diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp
index 041be42bcca..064ca1a03ec 100644
--- a/tests/Message_Block_Test.cpp
+++ b/tests/Message_Block_Test.cpp
@@ -268,7 +268,7 @@ struct
   ACE_Profile_Timer::ACE_Elapsed_Time et_;
 } alloc_struct[ACE_ALLOC_STRATEGY_NO] =
 {
-  { NULL, ACE_TEXT ("Default"), {0,0,0} },
+  { 0, ACE_TEXT ("Default"), {0,0,0} },
   { &mem_allocator, ACE_TEXT ("Cached Memory"), {0,0,0} }
 };
 
diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp
index c59ff63e537..0eee2d171d3 100644
--- a/tests/SOCK_Connector_Test.cpp
+++ b/tests/SOCK_Connector_Test.cpp
@@ -111,7 +111,7 @@ find_another_host (ACE_TCHAR other_host[])
       // Linux systems between <gethostent> and <gethostbyname_r>
       // (called by ACE_INET_Addr in host_is_up) This otherwise causes
       // an infinite loop on Linux --mas 03-08-2001
-      while ((h = gethostent ()) != NULL)
+      while ((h = gethostent ()) != 0)
         {
           if (ACE_OS::strcmp (h->h_name,
                               ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0)
diff --git a/tests/SOCK_SEQPACK_SCTP_Test.cpp b/tests/SOCK_SEQPACK_SCTP_Test.cpp
index 593516e9f3b..21737221ff7 100644
--- a/tests/SOCK_SEQPACK_SCTP_Test.cpp
+++ b/tests/SOCK_SEQPACK_SCTP_Test.cpp
@@ -166,7 +166,7 @@ Server (void *arg)
                 ACE_TEXT ("AcceptorSocket.close")));
   }
 
-  return NULL;
+  return 0;
 }
 
 void *
@@ -230,7 +230,7 @@ Client(void *arg)
                 ACE_TEXT (".recv_n succeeded after abort()\n")));
   }
 
-  return NULL;
+  return 0;
 }
 
 //
diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp
index 0ea7e561998..13427a3503b 100644
--- a/tests/Timer_Queue_Test.cpp
+++ b/tests/Timer_Queue_Test.cpp
@@ -486,7 +486,7 @@ public:
   // = Initialization method
   Timer_Queue_Stack (ACE_Timer_Queue *queue,
     const ACE_TCHAR *name,
-    Timer_Queue_Stack *next = NULL)
+    Timer_Queue_Stack *next = 0)
     : queue_ (queue),
     name_ (name),
     next_ (next)
@@ -515,7 +515,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   // = Perform initializations.
 
-  Timer_Queue_Stack *tq_stack = NULL;
+  Timer_Queue_Stack *tq_stack = 0;
 
   // Add new Timer_Queue implementations here.  Note that these will
   // be executed in "reverse order".
@@ -587,7 +587,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   Timer_Queue_Stack *tq_ptr = tq_stack;
 
-  while (tq_ptr != NULL)
+  while (tq_ptr != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("**** starting test of %s\n"),
diff --git a/tests/TkReactor_Test.cpp b/tests/TkReactor_Test.cpp
index c6089e47c5c..5a21dbf71c1 100644
--- a/tests/TkReactor_Test.cpp
+++ b/tests/TkReactor_Test.cpp
@@ -153,7 +153,7 @@ inc_count (ClientData client_data, Tcl_Interp *interp,int, const char **)
   //  sprintf (command,"set %s %s",(char *)client_data,new_string);
   // eval (command);
   const char *varValue = Tcl_SetVar (interp,(char *)client_data,new_string,TCL_LEAVE_ERR_MSG);
-  if (varValue == NULL)
+  if (varValue == 0)
     return TCL_ERROR;
   return TCL_OK;
 }
@@ -176,7 +176,7 @@ inc_tmo (ClientData client_data)
   //  sprintf (command,"set %s %s",(char *)client_data,new_string);
   //  eval (command);
   const char *varValue = Tcl_SetVar (tcl_interp,(char *)client_data,new_string,TCL_LEAVE_ERR_MSG);
-  if (varValue == NULL)
+  if (varValue == 0)
     ACE_ERROR ((LM_ERROR,"Tcl_SetVar failed in inc_tmo\n"));
 
   (void) Tk_CreateTimerHandler (1000,
@@ -200,7 +200,7 @@ public:
     //    sprintf (command,"set %s %s",(char *)arg,new_string);
     //    eval (command);
     const char *varValue = Tcl_SetVar (tcl_interp,(char *)arg,new_string,TCL_LEAVE_ERR_MSG);
-    if (varValue == NULL)
+    if (varValue == 0)
       ACE_ERROR_RETURN ((LM_ERROR,"Tcl_SetVar failed in handle_timeout\n"),-1);
 
     return 0;
@@ -316,7 +316,7 @@ run_main (int, ACE_TCHAR *[])
                       -1);
 
   ACE_Thread_Manager::instance ()->spawn ((ACE_THR_FUNC) client,
-                                          NULL,
+                                          0,
                                           THR_NEW_LWP | THR_DETACHED);
 
   while (!quit)
diff --git a/tests/XtReactor_Test.cpp b/tests/XtReactor_Test.cpp
index ed9fbabde15..94143e9fede 100644
--- a/tests/XtReactor_Test.cpp
+++ b/tests/XtReactor_Test.cpp
@@ -59,7 +59,7 @@ static void set_label(Widget w, const char *p)
   XtVaSetValues (w,
                  XmNlabelString,
                  XmStringCreateLocalized( (char*) p),
-                 NULL);
+                 0);
 }
 #define LABEL_WIDGET xmLabelWidgetClass
 #define BUTTON_WIDGET xmPushButtonWidgetClass
@@ -83,14 +83,14 @@ static Widget create_box(Widget parent, const char *name)
 
 static void set_label(Widget w, const char *p)
 {
-    XtVaSetValues (w, XtNlabel, p, NULL);
+    XtVaSetValues (w, XtNlabel, p, 0);
 }
 #define LABEL_WIDGET labelWidgetClass
 #define BUTTON_WIDGET commandWidgetClass
 #define PRESS_ME_CALLBACK XtNcallback
 static Widget create_box(Widget parent, const char * name)
 {
-    return XtCreateWidget( (char*) name, boxWidgetClass, parent, NULL, 0);
+    return XtCreateWidget( (char*) name, boxWidgetClass, parent, 0, 0);
 }
 #endif /* ACE_HAS_MOTIF */
 
@@ -270,12 +270,12 @@ run_main (int argc, ACE_TCHAR *argv[])
 #endif /* HummingBird_X */
   topLevel = XtVaAppInitialize (&app_context,
                                 "XTReactor_Test",
-                                NULL,
+                                0,
                                 0,
                                 &argc,
                                 argv,
-                                NULL,
-                                NULL);
+                                0,
+                                0);
 
   digits_rc = create_box(topLevel, "digits_rc");
 
@@ -283,7 +283,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   goodbye = XtCreateWidget ( (char *) "goodbye",
                              BUTTON_WIDGET,
                              digits_rc,
-                             NULL,
+                             0,
                              0);
   set_label(goodbye, "Stop Test");
 
@@ -291,14 +291,14 @@ run_main (int argc, ACE_TCHAR *argv[])
   PressMe = XtCreateWidget ((char *) "PressMe",
                             BUTTON_WIDGET,
                             digits_rc,
-                            NULL,
+                            0,
                             0);
 
   //Display for event counter
   lbl = XtCreateWidget ((char *) "label_for_event_one",
                         LABEL_WIDGET,
                         digits_rc,
-                        NULL,
+                        0,
                         0);
   set_label(lbl, "label_for_all_events");
   int ac = 0;
@@ -351,7 +351,7 @@ run_main (int argc, ACE_TCHAR *argv[])
                       -1);
 
   ACE_Thread_Manager::instance ()->spawn ((ACE_THR_FUNC) client,
-                                          NULL,
+                                          0,
                                           THR_NEW_LWP | THR_DETACHED);
 
   XtAppMainLoop (XtWidgetToApplicationContext (topLevel));