diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-12-12 16:02:27 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-12-12 16:02:27 +0100 |
| commit | 37a525baec16f7caaa2252394041051c949f301d (patch) | |
| tree | d02343e8d3b24655b082b117d63879ff83e89e7f /TAO/tests/MT_BiDir/Receiver_i.h | |
| parent | 87e4cdb2c157eb359d394c40115e0e6a91c68920 (diff) | |
| parent | 7f58353152673a611a86843b1db6f9453675d087 (diff) | |
| download | ATCD-37a525baec16f7caaa2252394041051c949f301d.tar.gz | |
Fixed merge conflicts
Diffstat (limited to 'TAO/tests/MT_BiDir/Receiver_i.h')
| -rw-r--r-- | TAO/tests/MT_BiDir/Receiver_i.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tests/MT_BiDir/Receiver_i.h b/TAO/tests/MT_BiDir/Receiver_i.h index 8f426fb3106..ea27d75337e 100644 --- a/TAO/tests/MT_BiDir/Receiver_i.h +++ b/TAO/tests/MT_BiDir/Receiver_i.h @@ -13,11 +13,11 @@ class Receiver_i { public: /// Constructor - Receiver_i (void); + Receiver_i (); /// Get the number of events that have been received, local method - CORBA::Long get_event_count (void); + CORBA::Long get_event_count (); // = The skeleton methods virtual void receive_payload (const Receiver::Payload &payload); |