From b2f0d495cd85188e0f9f2d4d363655da40e6e5e6 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 22 Jan 2015 12:25:18 -0800
Subject: Have I mentioned that I hate ADL?

---
 src/net/ip.cpp      | 4 ++--
 src/net/ip.hpp      | 4 ++--
 src/net/ip_test.cpp | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/net')

diff --git a/src/net/ip.cpp b/src/net/ip.cpp
index 4ec022b..3dc242d 100644
--- a/src/net/ip.cpp
+++ b/src/net/ip.cpp
@@ -29,7 +29,7 @@
 
 namespace tmwa
 {
-bool extract(XString str, IP4Address *rv)
+bool impl_extract(XString str, IP4Address *rv)
 {
     if (str.endswith('.'))
         return false;
@@ -42,7 +42,7 @@ bool extract(XString str, IP4Address *rv)
     return false;
 }
 
-bool extract(XString str, IP4Mask *rv)
+bool impl_extract(XString str, IP4Mask *rv)
 {
     IP4Address a, m;
     unsigned b;
diff --git a/src/net/ip.hpp b/src/net/ip.hpp
index ab45c56..82d9430 100644
--- a/src/net/ip.hpp
+++ b/src/net/ip.hpp
@@ -158,7 +158,7 @@ IP4Address IP4_BROADCAST({255, 255, 255, 255});
 VString<15> convert_for_printf(IP4Address a);
 VString<31> convert_for_printf(IP4Mask m);
 
-bool extract(XString str, IP4Address *iv);
+bool impl_extract(XString str, IP4Address *iv);
 
-bool extract(XString str, IP4Mask *iv);
+bool impl_extract(XString str, IP4Mask *iv);
 } // namespace tmwa
diff --git a/src/net/ip_test.cpp b/src/net/ip_test.cpp
index 419dc03..2b9bcad 100644
--- a/src/net/ip_test.cpp
+++ b/src/net/ip_test.cpp
@@ -24,6 +24,7 @@
 #include "../strings/literal.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/extract.hpp"
 
 #include "../poison.hpp"
 
-- 
cgit v1.2.3-70-g09d2