generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-09 11:17:31 +01:00
Code Issues Projects Releases Wiki Activity

don't inline methods containing private symbols #915

Browse Source
This commit is contained in:
Alex Fabijanic 2017-10-06 19:20:56 -05:00
parent 23d7d2c6cb
commit e0a5ebc06e
3 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Net/include/Poco/Net/IPAddress.h
View File

@ -397,67 +397,12 @@ private:
// inlines // inlines
// //
inline void IPAddress::destruct()
{
pImpl()->~IPAddressImpl();
}
inline IPAddress::Ptr IPAddress::pImpl() const inline IPAddress::Ptr IPAddress::pImpl() const
{ {
return reinterpret_cast<Ptr>(const_cast<char *>(_memory.buffer)); return reinterpret_cast<Ptr>(const_cast<char *>(_memory.buffer));
} }
inline void IPAddress::newIPv4()
{
new (storage()) Poco::Net::Impl::IPv4AddressImpl;
}
inline void IPAddress::newIPv4(const void* hostAddr)
{
new (storage()) Poco::Net::Impl::IPv4AddressImpl(hostAddr);
}
inline void IPAddress::newIPv4(unsigned prefix)
{
new (storage()) Poco::Net::Impl::IPv4AddressImpl(prefix);
}
#if defined(POCO_HAVE_IPv6)
inline void IPAddress::newIPv6()
{
new (storage()) Poco::Net::Impl::IPv6AddressImpl;
}
inline void IPAddress::newIPv6(const void* hostAddr)
{
new (storage()) Poco::Net::Impl::IPv6AddressImpl(hostAddr);
}
inline void IPAddress::newIPv6(const void* hostAddr, Poco::UInt32 scope)
{
new (storage()) Poco::Net::Impl::IPv6AddressImpl(hostAddr, scope);
}
inline void IPAddress::newIPv6(unsigned prefix)
{
new (storage()) Poco::Net::Impl::IPv6AddressImpl(prefix);
}
#endif // POCO_HAVE_IPv6
inline char* IPAddress::storage() inline char* IPAddress::storage()
{ {
return _memory.buffer; return _memory.buffer;

8
Net/src/ICMPSocketImpl.cpp
View File

@ -89,10 +89,10 @@ int ICMPSocketImpl::receiveFrom(void*, int, SocketAddress& address, int flags)
} }
while (expected && !_icmpPacket.validReplyID(buffer.begin(), maxPacketSize)); while (expected && !_icmpPacket.validReplyID(buffer.begin(), maxPacketSize));
} }
catch (ICMPException&) catch (ICMPException&)
{ {
throw; throw;
} }
catch (Exception&) catch (Exception&)
{ {
std::string err = _icmpPacket.errorDescription(buffer.begin(), maxPacketSize); std::string err = _icmpPacket.errorDescription(buffer.begin(), maxPacketSize);

55
Net/src/IPAddress.cpp
View File

@ -219,6 +219,60 @@ IPAddress::~IPAddress()
} }
void IPAddress::destruct()
{
pImpl()->~IPAddressImpl();
}
void IPAddress::newIPv4()
{
new (storage()) Poco::Net::Impl::IPv4AddressImpl;
}
void IPAddress::newIPv4(const void* hostAddr)
{
new (storage()) Poco::Net::Impl::IPv4AddressImpl(hostAddr);
}
void IPAddress::newIPv4(unsigned prefix)
{
new (storage()) Poco::Net::Impl::IPv4AddressImpl(prefix);
}
#if defined(POCO_HAVE_IPv6)
void IPAddress::newIPv6()
{
new (storage()) Poco::Net::Impl::IPv6AddressImpl;
}
void IPAddress::newIPv6(const void* hostAddr)
{
new (storage()) Poco::Net::Impl::IPv6AddressImpl(hostAddr);
}
void IPAddress::newIPv6(const void* hostAddr, Poco::UInt32 scope)
{
new (storage()) Poco::Net::Impl::IPv6AddressImpl(hostAddr, scope);
}
void IPAddress::newIPv6(unsigned prefix)
{
new (storage()) Poco::Net::Impl::IPv6AddressImpl(prefix);
}
#endif // POCO_HAVE_IPv6
IPAddress& IPAddress::operator = (const IPAddress& addr) IPAddress& IPAddress::operator = (const IPAddress& addr)
{ {
if (&addr != this) if (&addr != this)
@ -598,3 +652,4 @@ std::ostream& operator << (std::ostream& ostr, const Poco::Net::IPAddress& addr)
ostr << addr.toString(); ostr << addr.toString();
return ostr; return ostr;
} }