4 files changed, 26 insertions, 11 deletions
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
index 0a2300f6110..d9b643a66ef 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
@@ -10,7 +10,7 @@
 //    MT_Object_A_i.h
 //
 // = DESCRIPTION
-//    This class implements the Object A of the 
+//    This class implements the Object A of the
 //    Nested Upcalls - MT Client test
 //
 // = AUTHORS
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (MT_OBJECT_IMPL_H)
+#ifndef MT_OBJECT_IMPL_H
 #  define MT_OBJECT_IMPL_H
 
 #include "MT_Client_TestS.h"
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
index b46b41f6d79..b0ddfdec286 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
@@ -17,10 +17,15 @@
 //
 // ============================================================================
 
-#if !defined (MT_CLIENT_H)
+#ifndef MT_CLIENT_H
 #define MT_CLIENT_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
 #include "tao/corba.h"
@@ -43,9 +48,9 @@ public:
   int run (void);
   // Execute client example code.
 
-  int init (int argc, 
+  int init (int argc,
             char **argv,
-	    int client_number);
+            int client_number);
   // Initialize the client communication endpoint with server.
 
 private:
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
index 84bfc68d5fa..47448a588a0 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -10,7 +10,7 @@
 //    local_server.h
 //
 // = DESCRIPTION
-//     This class implements a simple server for the 
+//     This class implements a simple server for the
 //     Nested Upcalls - MT Client test
 //
 // = AUTHORS
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (MT_CLIENT_TEST_MT_SERVER_H)
+#ifndef MT_CLIENT_TEST_MT_SERVER_H
 #define MT_CLIENT_TEST_MT_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "MT_Object_i.h"
@@ -70,7 +75,7 @@ private:
   // The ORB manager
 
   MT_Object_i mT_Object_i_;
-  // Implementation object 
+  // Implementation object
 
   MT_Object_var mT_Object_var_;
   // reference for the distant MT Object
@@ -95,7 +100,7 @@ class MT_Server_Task : public ACE_Task<ACE_SYNCH>
   //    No big purpose, just wrapping
 public:
   MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr,
-                  int argc, 
+                  int argc,
                   char **argv,
                   TAO_ORB_Manager* orb_manager_ptr);
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
index cb58c0d6376..b744c1b78c3 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
@@ -10,7 +10,7 @@
 //    server_A.h
 //
 // = DESCRIPTION
-//      This class implements a simple server for the 
+//      This class implements a simple server for the
 //      Nested Upcalls - MT Client test
 //
 // = AUTHORS
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (MT_CLIENT_TEST_MT_OBJECT_SERVER_H)
+#ifndef MT_CLIENT_TEST_MT_OBJECT_SERVER_H
 #define MT_CLIENT_TEST_MT_OBJECT_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "MT_Object_i.h"