Skip to content

Commit a86a104

Browse files
Initialize if_name_ in header instead of constructor init list
1 parent 583efa8 commit a86a104

File tree

2 files changed

+13
-25
lines changed

2 files changed

+13
-25
lines changed

ACE/ace/INET_Addr.cpp

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,7 @@ ACE_INET_Addr::reset ()
165165
}
166166

167167
ACE_INET_Addr::ACE_INET_Addr ()
168-
: ACE_Addr (determine_type (), sizeof (inet_addr_)),
169-
if_name_ (nullptr)
168+
: ACE_Addr (determine_type (), sizeof (inet_addr_))
170169
{
171170
// ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
172171
this->reset_i ();
@@ -291,17 +290,15 @@ ACE_INET_Addr::set (const char address[], int address_family)
291290
}
292291

293292
ACE_INET_Addr::ACE_INET_Addr (const char address[], int address_family)
294-
: ACE_Addr (determine_type (), sizeof (inet_addr_)),
295-
if_name_ (nullptr)
293+
: ACE_Addr (determine_type (), sizeof (inet_addr_))
296294
{
297295
ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
298296
this->set (address, address_family);
299297
}
300298

301299
#if defined (ACE_HAS_WCHAR)
302300
ACE_INET_Addr::ACE_INET_Addr (const wchar_t address[], int address_family)
303-
: ACE_Addr (determine_type (), sizeof (inet_addr_)),
304-
if_name_ (nullptr)
301+
: ACE_Addr (determine_type (), sizeof (inet_addr_))
305302
{
306303
ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
307304
this->set (address, address_family);
@@ -312,8 +309,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t address[], int address_family)
312309
// Copy constructor.
313310

314311
ACE_INET_Addr::ACE_INET_Addr (const ACE_INET_Addr &sa)
315-
: ACE_Addr (sa.get_type (), sa.get_size()),
316-
if_name_ (nullptr)
312+
: ACE_Addr (sa.get_type (), sa.get_size())
317313
{
318314
ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
319315
this->set (sa);
@@ -548,8 +544,7 @@ ACE_INET_Addr::set (const char port_name[],
548544
ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
549545
const char host_name[],
550546
int address_family)
551-
: ACE_Addr (determine_type (), sizeof (inet_addr_)),
552-
if_name_ (nullptr)
547+
: ACE_Addr (determine_type (), sizeof (inet_addr_))
553548
{
554549
ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
555550
ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_));
@@ -567,8 +562,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
567562
ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
568563
const wchar_t host_name[],
569564
int address_family)
570-
: ACE_Addr (determine_type (), sizeof (inet_addr_)),
571-
if_name_ (nullptr)
565+
: ACE_Addr (determine_type (), sizeof (inet_addr_))
572566
{
573567
ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
574568
ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_));
@@ -667,8 +661,7 @@ ACE_INET_Addr::set_addr (const void *addr, int /* len */, int map)
667661

668662
// Creates a ACE_INET_Addr from a sockaddr_in structure.
669663
ACE_INET_Addr::ACE_INET_Addr (const sockaddr_in *addr, int len)
670-
: ACE_Addr (determine_type (), sizeof (inet_addr_)),
671-
if_name_ (nullptr)
664+
: ACE_Addr (determine_type (), sizeof (inet_addr_))
672665
{
673666
ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
674667
this->set (addr, len);
@@ -677,8 +670,7 @@ ACE_INET_Addr::ACE_INET_Addr (const sockaddr_in *addr, int len)
677670
// Creates a ACE_INET_Addr from a PORT_NUMBER and an Internet address.
678671
ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
679672
ACE_UINT32 inet_address)
680-
: ACE_Addr (determine_type (), sizeof (inet_addr_)),
681-
if_name_ (nullptr)
673+
: ACE_Addr (determine_type (), sizeof (inet_addr_))
682674
{
683675
ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
684676
if (this->set (port_number, inet_address) == -1)
@@ -692,8 +684,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
692684
ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
693685
const char host_name[],
694686
const char protocol[])
695-
: ACE_Addr (determine_type (), sizeof (inet_addr_)),
696-
if_name_ (nullptr)
687+
: ACE_Addr (determine_type (), sizeof (inet_addr_))
697688
{
698689
ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
699690
if (this->set (port_name,
@@ -707,8 +698,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
707698
ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
708699
const wchar_t host_name[],
709700
const wchar_t protocol[])
710-
: ACE_Addr (determine_type (), sizeof (inet_addr_)),
711-
if_name_ (nullptr)
701+
: ACE_Addr (determine_type (), sizeof (inet_addr_))
712702
{
713703
ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
714704
if (this->set (port_name,
@@ -723,8 +713,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
723713
ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
724714
ACE_UINT32 inet_address,
725715
const char protocol[])
726-
: ACE_Addr (determine_type (), sizeof (inet_addr_)),
727-
if_name_ (nullptr)
716+
: ACE_Addr (determine_type (), sizeof (inet_addr_))
728717
{
729718
ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
730719
if (this->set (port_name,
@@ -738,8 +727,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
738727
ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
739728
ACE_UINT32 inet_address,
740729
const wchar_t protocol[])
741-
: ACE_Addr (determine_type (), sizeof (inet_addr_)),
742-
if_name_ (nullptr)
730+
: ACE_Addr (determine_type (), sizeof (inet_addr_))
743731
{
744732
ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
745733
if (this->set (port_name,

ACE/ace/INET_Addr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ class ACE_Export ACE_INET_Addr : public ACE_Addr
438438
std::vector<union ip46> inet_addrs_;
439439
std::vector<union ip46>::iterator inet_addrs_iter_;
440440

441-
std::shared_ptr<const std::string> if_name_;
441+
std::shared_ptr<const std::string> if_name_ = nullptr;
442442
};
443443

444444
ACE_END_VERSIONED_NAMESPACE_DECL

0 commit comments

Comments
 (0)