summaryrefslogtreecommitdiff
path: root/ACE/ace/INET_Addr.inl
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2015-03-12 18:52:45 -0400
committerSteve Huston <shuston@riverace.com>2015-03-12 18:52:45 -0400
commit47ccfd63e27de8fa9c92fad653e40a49e404efb3 (patch)
tree3e1743623aa3f68b4e3b9a3c5cb87a49015aee9a /ACE/ace/INET_Addr.inl
parent2090102d827e2010a939d9ececd1118fa816fff9 (diff)
parent162ff579089f2c28b72f1e2952baeca125dcfb24 (diff)
downloadATCD-47ccfd63e27de8fa9c92fad653e40a49e404efb3.tar.gz
Merge back from master to prepare for pull
Diffstat (limited to 'ACE/ace/INET_Addr.inl')
-rw-r--r--ACE/ace/INET_Addr.inl2
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl
index 2532bb9cb6f..6cc14c97558 100644
--- a/ACE/ace/INET_Addr.inl
+++ b/ACE/ace/INET_Addr.inl
@@ -7,7 +7,7 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
-ACE_INET_Addr::reset_i (void)
+ACE_INET_Addr::reset (void)
{
ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_));
if (this->get_type() == AF_INET)