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/BiDirectional/test_i.h | |
| parent | 87e4cdb2c157eb359d394c40115e0e6a91c68920 (diff) | |
| parent | 7f58353152673a611a86843b1db6f9453675d087 (diff) | |
| download | ATCD-37a525baec16f7caaa2252394041051c949f301d.tar.gz | |
Fixed merge conflicts
Diffstat (limited to 'TAO/tests/BiDirectional/test_i.h')
| -rw-r--r-- | TAO/tests/BiDirectional/test_i.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h index 7536e63f0d6..8444d669abe 100644 --- a/TAO/tests/BiDirectional/test_i.h +++ b/TAO/tests/BiDirectional/test_i.h @@ -28,15 +28,14 @@ public: Callback_i (CORBA::ORB_ptr orb); /// Safe way to shutdown - void shutdown (void); + void shutdown (); /// The callback method - void callback_method (void); + void callback_method (); private: /// The orb CORBA::ORB_var orb_; - }; /** @@ -57,9 +56,9 @@ public: void callback_object (Callback_ptr callback); - void shutdown (void); + void shutdown (); - int call_client (void); + int call_client (); private: /// The ORB |