From aad9a8377c4178b529c5d21fecb3c9462a1e748b Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Tue, 5 Jun 2012 22:50:31 +1000
Subject: [PATCH] Move to_json and from_json to root namespace

---
 json.hpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/json.hpp b/json.hpp
index 0ac699e8..14995f36 100644
--- a/json.hpp
+++ b/json.hpp
@@ -270,16 +270,16 @@ namespace json {
             { ; }
     };
 
-
-    template <typename T>
-    json::node&& to_json (const T&);
-
-    template <typename T>
-    T&& from_json (const json::node&);
-
     std::ostream&
     operator <<(std::ostream &os, const json::node &n);
 }
 
+
+template <typename T>
+json::node&& to_json (const T&);
+
+template <typename T>
+T from_json (const json::node&);
+
 #endif