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/high/extract_mmo.cpp | 10 +++++-----
 src/high/extract_mmo.hpp | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/high')

diff --git a/src/high/extract_mmo.cpp b/src/high/extract_mmo.cpp
index a674656..dae6a3b 100644
--- a/src/high/extract_mmo.cpp
+++ b/src/high/extract_mmo.cpp
@@ -32,13 +32,13 @@
 // TODO also pass an io::LineSpan around.
 namespace tmwa
 {
-bool extract(XString str, GlobalReg *var)
+bool impl_extract(XString str, GlobalReg *var)
 {
     return extract(str,
             record<','>(&var->str, &var->value));
 }
 
-bool extract(XString str, Item *it)
+bool impl_extract(XString str, Item *it)
 {
     XString ignored;
     XString corruption_hack_amount;
@@ -66,7 +66,7 @@ bool extract(XString str, Item *it)
     return rv;
 }
 
-bool extract(XString str, MapName *m)
+bool impl_extract(XString str, MapName *m)
 {
     XString::iterator it = std::find(str.begin(), str.end(), '.');
     str = str.xislice_h(it);
@@ -76,7 +76,7 @@ bool extract(XString str, MapName *m)
     return rv;
 }
 
-bool extract(XString str, CharName *out)
+bool impl_extract(XString str, CharName *out)
 {
     VString<23> tmp;
     if (extract(str, &tmp))
@@ -87,7 +87,7 @@ bool extract(XString str, CharName *out)
     return false;
 }
 
-bool extract(XString str, NpcEvent *ev)
+bool impl_extract(XString str, NpcEvent *ev)
 {
     XString mid;
     return extract(str, record<':'>(&ev->npc, &mid, &ev->label)) && !mid;
diff --git a/src/high/extract_mmo.hpp b/src/high/extract_mmo.hpp
index 0c18090..5fcd06f 100644
--- a/src/high/extract_mmo.hpp
+++ b/src/high/extract_mmo.hpp
@@ -23,10 +23,10 @@
 
 namespace tmwa
 {
-bool extract(XString str, GlobalReg *var);
-bool extract(XString str, Item *it);
-bool extract(XString str, MapName *m);
-bool extract(XString str, CharName *out);
+bool impl_extract(XString str, GlobalReg *var);
+bool impl_extract(XString str, Item *it);
+bool impl_extract(XString str, MapName *m);
+bool impl_extract(XString str, CharName *out);
 
-bool extract(XString str, NpcEvent *ev);
+bool impl_extract(XString str, NpcEvent *ev);
 } // namespace tmwa
-- 
cgit v1.2.3-60-g2f50