5 files changed, 19 insertions, 9 deletions
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h
index 089b01c88ec..73d15f8326a 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h
@@ -19,6 +19,11 @@
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corba.h"
 #include "orbsvcs/CosConcurrencyControlC.h"
 #include "orbsvcs/CosNamingC.h"
@@ -27,7 +32,7 @@
 #include "CC_command.h"
 #include "CC_command.tab.h"
 
-#if !defined(_CC_CLIENT_H_)
+#ifndef _CC_CLIENT_H_
 #define _CC_CLIENT_H_
 
 // Stuff to be used by the command file parser
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
index 9c4e4f84bfb..4f247f92c51 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -23,7 +23,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
 
-#if !defined (_CC_NAMING_SERVICE_H_)
+#ifndef _CC_NAMING_SERVICE_H_
 #define _CC_NAMING_SERVICE_H_
 
 class CC_naming_service
@@ -77,7 +77,7 @@ private:
 
   TAO_Naming_Client my_name_client_;
   // Name service wrapper class
-  
+
   CosConcurrencyControl::LockSetFactory_var factory_;
   // factory pointer for the lock set.
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
index b5bfaa549b9..4c1a643f863 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
@@ -13,7 +13,7 @@
 //      concurrency service test.
 //
 // = AUTHORS
-//	Torben Worm <tworm@cs.wustl.edu>
+//      Torben Worm <tworm@cs.wustl.edu>
 //
 // ============================================================================
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.h b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
index 3d9bca5b57e..086ea0766b1 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
@@ -23,7 +23,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "CC_naming_service.h"
 
-#if !defined (_CC_TESTS_H_)
+#ifndef _CC_TESTS_H_
 #define _CC_TESTS_H_
 
 // Return codes for the tests
diff --git a/TAO/orbsvcs/tests/Concurrency/NS_client.h b/TAO/orbsvcs/tests/Concurrency/NS_client.h
index 427f3d82547..6c6407511e8 100644
--- a/TAO/orbsvcs/tests/Concurrency/NS_client.h
+++ b/TAO/orbsvcs/tests/Concurrency/NS_client.h
@@ -11,19 +11,24 @@
 //
 // = DESCRIPTION
 //      This class tests the facilities to connect to the naming
-//      service	and to resolve the name for the concurrency service client.
+//      service and to resolve the name for the concurrency service client.
 //
 // = AUTHORS
 //      Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//	Torben Worm <tworm@cs.wustl.edu>
+//      Torben Worm <tworm@cs.wustl.edu>
 //
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corba.h"
 #include "orbsvcs/orbsvcs/CosNamingC.h"
 
-class CosNaming_Client 
+class CosNaming_Client
 {
   // = TITLE
   //    Defines a class that encapsulates behaviour of the CosNaming
@@ -64,7 +69,7 @@ private:
 
   TAO_Naming_Client my_name_client_;
   // And our Naming Client!
-  
+
   int list_contents_;
   // Iterate through the naming service and list the contents.