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/Bug_2677_Regression/DllORB.cpp | |
| parent | 87e4cdb2c157eb359d394c40115e0e6a91c68920 (diff) | |
| parent | 7f58353152673a611a86843b1db6f9453675d087 (diff) | |
| download | ATCD-37a525baec16f7caaa2252394041051c949f301d.tar.gz | |
Fixed merge conflicts
Diffstat (limited to 'TAO/tests/Bug_2677_Regression/DllORB.cpp')
| -rw-r--r-- | TAO/tests/Bug_2677_Regression/DllORB.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/TAO/tests/Bug_2677_Regression/DllORB.cpp b/TAO/tests/Bug_2677_Regression/DllORB.cpp index 2df14afddd0..ab2b7bb796e 100644 --- a/TAO/tests/Bug_2677_Regression/DllORB.cpp +++ b/TAO/tests/Bug_2677_Regression/DllORB.cpp @@ -4,14 +4,14 @@ #include "ace/OS_NS_unistd.h" #include "tao/TAO_Singleton_Manager.h" -DllORB::DllORB (void) +DllORB::DllORB () : failPrePostInit_ (3), mv_orb_ (), mv_rootPOA_ () { } -DllORB::~DllORB (void) +DllORB::~DllORB () { } @@ -103,7 +103,7 @@ DllORB::init (int argc, ACE_TCHAR *argv[]) int -DllORB::fini (void) +DllORB::fini () { try { |