Skip to content

Commit 8d7738e

Browse files
authored
Merge pull request #2424 from jwillemsen/jwi-locatorlocater
Fixed compile errors with C++23
2 parents 2adb981 + ae228e4 commit 8d7738e

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class ImR_Locator_ORB_Runner : public ACE_Task_Base
2020
ImR_Locator_Loader& service_;
2121
};
2222

23-
ImR_Locator_Loader::ImR_Locator_Loader()
23+
ImR_Locator_Loader::~ImR_Locator_Loader()
2424
{
2525
}
2626

TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@ class ImR_Locator_ORB_Runner;
1717
class Locator_Export ImR_Locator_Loader : public TAO_Object_Loader
1818
{
1919
public:
20-
ImR_Locator_Loader();
20+
ImR_Locator_Loader() = default;
21+
~ImR_Locator_Loader();
2122

22-
virtual int init (int argc, ACE_TCHAR *argv[]);
23+
int init (int argc, ACE_TCHAR *argv[]) override;
2324

24-
virtual int fini ();
25+
int fini () override;
2526

26-
virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
27-
int argc,
28-
ACE_TCHAR *argv[]);
27+
CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
28+
int argc,
29+
ACE_TCHAR *argv[]) override;
2930

3031
// Unlike other service objects, we have our own orb.
3132
int run();

0 commit comments

Comments
 (0)