diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-04-23 09:25:51 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-04-23 09:25:51 +0200 |
| commit | 17fc02df28233df6df48daa00f62a89b6629ef4b (patch) | |
| tree | 3d1355f1b80463d4d4fa11dbaef0098db425be33 /TAO | |
| parent | f9795720372157103983d8f3867504a25cdd2451 (diff) | |
| download | ATCD-17fc02df28233df6df48daa00f62a89b6629ef4b.tar.gz | |
Make use of default
* TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp:
* TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h:
* TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp:
* TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h:
Diffstat (limited to 'TAO')
4 files changed, 7 insertions, 21 deletions
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp index 91143969b3c..b355371b492 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp @@ -8,10 +8,6 @@ Callback_i::Callback_i (CORBA::ORB_ptr orb) { } -Callback_i::~Callback_i (void) -{ -} - void Callback_i::shutdown () { std::cout << "Performing clean shutdown." << std::endl; diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h index dc70a79ed39..4c575795233 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h @@ -8,11 +8,11 @@ class Callback_i : public virtual POA_Callback public: Callback_i (CORBA::ORB_ptr orb); - virtual ~Callback_i (void); + virtual ~Callback_i () = default; - virtual void shutdown (void); + virtual void shutdown (); - virtual void callback_method (void); + virtual void callback_method (); private: CORBA::ORB_var orb_; diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp index 32c5f1c39b4..373d2d387e0 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp @@ -16,10 +16,6 @@ Simple_i::Simple_i (CORBA::ORB_ptr orb, int callback_count) { } -Simple_i::~Simple_i (void) -{ -} - CORBA::Long Simple_i::test_method (CORBA::Boolean do_callback) { if (do_callback) { diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h index 614ccafecda..199fd9297c2 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h @@ -8,19 +8,13 @@ class Simple_i : public virtual POA_Simple public: Simple_i (CORBA::ORB_ptr orb, int iterations); - virtual ~Simple_i (void); + ~Simple_i () = default; -virtual CORBA::Long test_method ( - CORBA::Boolean do_callback - ); + virtual CORBA::Long test_method (CORBA::Boolean do_callback); -virtual void callback_object ( - Callback_ptr cb - ); + virtual void callback_object (Callback_ptr cb); -virtual void shutdown ( - - ); + virtual void shutdown (); /// Not part of the CORBA interface. This method is called /// by our special orb event loop in server main(). |