Skip to content

Commit faf8e40

Browse files
authored
Merge pull request #2381 from jwillemsen/jwi-apgstreams
Fix compiler warnings
2 parents a8bd289 + f31e4b6 commit faf8e40

12 files changed

Lines changed: 17 additions & 27 deletions

File tree

ACE/examples/APG/Naming/EMail.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
class EMail
77
{
88
public:
9-
EMail()
10-
{ }
9+
EMail() = default;
1110

1211
int send (const char *to,
1312
const char *from,

ACE/examples/APG/Shared_Memory/Record.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
class Record
1414
{
1515
public:
16-
Record () { }
17-
~Record () { }
16+
Record () = default;
17+
~Record () = default;
1818

1919
Record (const Record& rec)
2020
: id1_(rec.id1_), id2_(rec.id2_)
@@ -29,12 +29,12 @@ class Record
2929
this->name_ = recName_;
3030
}
3131
char *name () { return recName_; }
32-
int id1 () { return id1_; }
33-
int id2 () { return id2_; }
32+
int id1 () const { return id1_; }
33+
int id2 () const { return id2_; }
3434

3535
private:
36-
int id1_;
37-
int id2_;
36+
int id1_ {};
37+
int id2_ {};
3838
char recName_[128];
3939
ACE_Based_Pointer_Basic<char> name_;
4040
};

ACE/examples/APG/Signals/SigHandler.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ class MySignalHandler : public ACE_Event_Handler
1010
MySignalHandler (int signum) : signum_(signum)
1111
{ }
1212

13-
virtual ~MySignalHandler()
14-
{ }
13+
virtual ~MySignalHandler() = default;
1514

1615
virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0)
1716
{

ACE/examples/APG/Signals/SigHandlers.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ class MySignalHandler : public ACE_Event_Handler
99
MySignalHandler (int signum) : signum_(signum)
1010
{ }
1111

12-
virtual ~MySignalHandler ()
13-
{ }
12+
virtual ~MySignalHandler () = default;
1413

1514
virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0)
1615
{

ACE/examples/APG/Streams/CommandStream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class CommandStream : public ACE_Stream<ACE_MT_SYNCH>
3333
Command *execute (Command *command);
3434

3535
private:
36-
CommandStream () { }
36+
CommandStream () = default;
3737

3838
ACE_SOCK_Stream *peer_;
3939
};

ACE/examples/APG/Streams/CommandTask.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class CommandTask : public ACE_Task<ACE_MT_SYNCH>
1313
public:
1414
typedef ACE_Task<ACE_MT_SYNCH> inherited;
1515

16-
virtual ~CommandTask () { }
16+
virtual ~CommandTask () = default;
1717

1818
virtual int open (void * = 0 );
1919

ACE/examples/APG/Streams/Message.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ class Message
1010
Message () : device_(0), type_(0), id_(0)
1111
{ }
1212

13-
~Message ()
14-
{ }
13+
~Message () = default;
1514

1615
RecordingDevice *recorder ()
1716
{

ACE/examples/APG/ThreadPools/Futures.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class Worker;
8080
class IManager
8181
{
8282
public:
83-
virtual ~IManager () { }
83+
virtual ~IManager () = default;
8484

8585
virtual int return_to_work (Worker *worker) = 0;
8686
};

ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
class Workers : public ACE_Task<ACE_MT_SYNCH>
1212
{
1313
public:
14-
Workers ()
15-
{ }
14+
Workers () = default;
1615

1716
virtual int svc ()
1817
{

ACE/examples/APG/ThreadPools/ThreadPool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Worker;
1717
class IManager
1818
{
1919
public:
20-
virtual ~IManager () { }
20+
virtual ~IManager () = default;
2121

2222
virtual int return_to_work (Worker *worker) = 0;
2323
};

0 commit comments

Comments
 (0)