diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-20 02:34:57 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-20 02:34:57 +0000 |
| commit | 0902828269fb1a42ed23c208fd61bac76aaddc13 (patch) | |
| tree | 5967e9ca7d44ed1d2823be9746817ebb8e025f5d /examples/Bounded_Packet_Relay | |
| parent | e7788cff873f30e65d44d38db7cfafc175f748a3 (diff) | |
| download | ATCD-0902828269fb1a42ed23c208fd61bac76aaddc13.tar.gz | |
changed include protection from #if !defined to ifndef, and added #pragma once, if possible
Diffstat (limited to 'examples/Bounded_Packet_Relay')
| -rw-r--r-- | examples/Bounded_Packet_Relay/BPR_Drivers.h | 7 | ||||
| -rw-r--r-- | examples/Bounded_Packet_Relay/BPR_Drivers_T.h | 6 | ||||
| -rw-r--r-- | examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h | 25 |
3 files changed, 26 insertions, 12 deletions
diff --git a/examples/Bounded_Packet_Relay/BPR_Drivers.h b/examples/Bounded_Packet_Relay/BPR_Drivers.h index 49812a07d79..83f37022994 100644 --- a/examples/Bounded_Packet_Relay/BPR_Drivers.h +++ b/examples/Bounded_Packet_Relay/BPR_Drivers.h @@ -26,10 +26,15 @@ // // ============================================================================ -#if !defined (_BPR_DRIVERS_H_) +#ifndef _BPR_DRIVERS_H_ #define _BPR_DRIVERS_H_ #include "ace/Functor.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Task.h" #include "ace/Synch.h" diff --git a/examples/Bounded_Packet_Relay/BPR_Drivers_T.h b/examples/Bounded_Packet_Relay/BPR_Drivers_T.h index 31a8a41f798..8ad1b48564c 100644 --- a/examples/Bounded_Packet_Relay/BPR_Drivers_T.h +++ b/examples/Bounded_Packet_Relay/BPR_Drivers_T.h @@ -26,11 +26,15 @@ // // ============================================================================ -#if !defined (_BPR_DRIVERS_T_H_) +#ifndef _BPR_DRIVERS_T_H_ #define _BPR_DRIVERS_T_H_ #include "ace/Functor.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward declarations. class Input_Device_Wrapper_Base; class Output_Device_Wrapper_Base; diff --git a/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h b/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h index 11759e10ca5..30cff587f06 100644 --- a/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h +++ b/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h @@ -25,12 +25,17 @@ // // ============================================================================ -#if !defined (_THREAD_BOUNDED_PACKET_RELAY_H_) +#ifndef _THREAD_BOUNDED_PACKET_RELAY_H_ #define _THREAD_BOUNDED_PACKET_RELAY_H_ #define ACE_HAS_DEFERRED_TIMER_COMMANDS #include "ace/Functor.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Task.h" #include "ace/Timer_Heap_T.h" #include "ace/Timer_Queue_Adapters.h" @@ -39,14 +44,14 @@ // These typedefs ensure that we use the minimal amount of locking // necessary. typedef ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex> - Upcall; + Upcall; typedef ACE_Timer_Heap_T<ACE_Event_Handler *, - Upcall, - ACE_Null_Mutex> - Timer_Heap; + Upcall, + ACE_Null_Mutex> + Timer_Heap; typedef ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *, - Upcall, - ACE_Null_Mutex> + Upcall, + ACE_Null_Mutex> Timer_Heap_Iterator; typedef ACE_Thread_Timer_Queue_Adapter<Timer_Heap> Thread_Timer_Queue; @@ -171,7 +176,7 @@ public: User_Input_Task (Bounded_Packet_Relay *relay, Thread_Timer_Queue *queue, - Thread_Bounded_Packet_Relay_Driver &timer_queue_driver); + Thread_Bounded_Packet_Relay_Driver &timer_queue_driver); // Constructor. ~User_Input_Task (void); @@ -300,7 +305,7 @@ public: // Destructor. virtual int handle_timeout (const ACE_Time_Value ¤t_time, - const void *arg); + const void *arg); // Call back hook. virtual int cancelled (void); @@ -344,7 +349,7 @@ public: // Destructor. virtual int handle_timeout (const ACE_Time_Value ¤t_time, - const void *arg); + const void *arg); // Call back hook. virtual int cancelled (void); |