changed include protection from #if !defined to ifndef, and added #pragma once, if possible

4 files changed, 23 insertions, 13 deletions

diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h
index 87e54162477..2b4958ef096 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.h
+++ b/TAO/examples/Simple/chat/Broadcaster_i.h
@@ -17,13 +17,18 @@
 //
 // ===========================================================
 
-#if !defined (BROADCASTER_I_H)
+#ifndef BROADCASTER_I_H
 #define BROADCASTER_I_H
 
 #include "BroadcasterS.h"
 #include "ReceiverC.h"
 #include "tao/TAO.h"
 #include "ace/Containers.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SString.h"
 
 class Broadcaster_i : public POA_Broadcaster
@@ -40,17 +45,17 @@ public:
   // Destructor.
 
   virtual void add (Receiver_ptr receiver,
-		    const char *nickname,
-		    CORBA::Environment &TAO_TRY_ENV);
+                    const char *nickname,
+                    CORBA::Environment &TAO_TRY_ENV);
   // Saves receiver references in a list.
 
   virtual void remove (Receiver_ptr receiver,
-		       CORBA::Environment &TAO_TRY_ENV);
+                       CORBA::Environment &TAO_TRY_ENV);
   // Removes receiver references from the list.
 
   virtual void say (Receiver_ptr receiver,
-		    const char *text,
-		    CORBA::Environment &TAO_TRY_ENV);
+                    const char *text,
+                    CORBA::Environment &TAO_TRY_ENV);
   // Called by Broadcaster clients to send messages.
 
 public:
@@ -58,7 +63,7 @@ public:
   // The ORB manager.
 
   void broadcast (const char* text,
-		  CORBA::Environment &TAO_TRY_ENV);
+                  CORBA::Environment &TAO_TRY_ENV);
   // Broadcasts the text to all registered clients.
 
   class Receiver_Data
@@ -82,7 +87,7 @@ public:
   typedef ACE_Unbounded_Set<Receiver_Data>
           RECEIVER_SET;
   typedef ACE_Unbounded_Set_Iterator<Receiver_Data>
-	  RECEIVER_SET_ITERATOR;
+          RECEIVER_SET_ITERATOR;
 
   RECEIVER_SET receiver_set_;
   // Set of registered clients.
diff --git a/TAO/examples/Simple/chat/Client_i.h b/TAO/examples/Simple/chat/Client_i.h
index f62bf9a769e..bbbd82d289e 100644
--- a/TAO/examples/Simple/chat/Client_i.h
+++ b/TAO/examples/Simple/chat/Client_i.h
@@ -18,12 +18,17 @@
 //
 // ===========================================================
 
-#if !defined (CLIENT_I_H)
+#ifndef CLIENT_I_H
 #define CLIENT_I_H
 
 #include "Receiver_i.h"
 #include "BroadcasterC.h"
 #include "ace/Read_Buffer.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/TAO.h"
 
 class Client_i : public ACE_Event_Handler
diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h
index b0db0d1618e..c0ec2f98fc2 100644
--- a/TAO/examples/Simple/chat/Receiver_i.h
+++ b/TAO/examples/Simple/chat/Receiver_i.h
@@ -17,7 +17,7 @@
 //
 // ===========================================================
 
-#if !defined (RECEIVER_I_H)
+#ifndef RECEIVER_I_H
 #define RECEIVER_I_H
 
 #include "ReceiverS.h"
diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h
index 2622ee027c9..dca164d5ba6 100644
--- a/TAO/examples/Simple/chat/Server_i.h
+++ b/TAO/examples/Simple/chat/Server_i.h
@@ -18,7 +18,7 @@
 //
 // ===========================================================
 
-#if !defined (SERVER_I_H)
+#ifndef SERVER_I_H
 #define SERVER_I_H
 
 #include "Broadcaster_i.h"
@@ -39,8 +39,8 @@ public:
  // Destructor.
 
  int init (int argc,
-	    char *argv[],
-	    CORBA::Environment &env);
+            char *argv[],
+            CORBA::Environment &env);
  // Initialize the server.
 
  int run (CORBA::Environment &env);