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/POA/DSI/client.cpp | |
| parent | 87e4cdb2c157eb359d394c40115e0e6a91c68920 (diff) | |
| parent | 7f58353152673a611a86843b1db6f9453675d087 (diff) | |
| download | ATCD-37a525baec16f7caaa2252394041051c949f301d.tar.gz | |
Fixed merge conflicts
Diffstat (limited to 'TAO/tests/POA/DSI/client.cpp')
| -rw-r--r-- | TAO/tests/POA/DSI/client.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/TAO/tests/POA/DSI/client.cpp b/TAO/tests/POA/DSI/client.cpp index 2647416cc9c..589b90aa958 100644 --- a/TAO/tests/POA/DSI/client.cpp +++ b/TAO/tests/POA/DSI/client.cpp @@ -64,7 +64,7 @@ parse_args (int argc, ACE_TCHAR **argv) } int -read_IOR_from_file (void) +read_IOR_from_file () { // Open the file for reading. ACE_HANDLE f_handle = @@ -95,7 +95,6 @@ read_IOR_from_file (void) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - char str [255]; // Initialize the ORB try |