From be8b87885521110ea387831820d105d142de0206 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 8 Jun 2013 09:57:28 -0700
Subject: gras: query changes from thread query branch

---
 lib/json_parser.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/json_parser.cpp')

diff --git a/lib/json_parser.cpp b/lib/json_parser.cpp
index d66297f..eef70f3 100644
--- a/lib/json_parser.cpp
+++ b/lib/json_parser.cpp
@@ -9,6 +9,7 @@
 #endif
 //--------- end bullshit --------------//
 
+#include "gras_impl/query_common.hpp"
 #include "gras_impl/debug.hpp"
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
@@ -16,7 +17,7 @@
 #include <sstream>
 #include <string>
 
-boost::property_tree::ptree json_to_ptree(const std::string &s)
+boost::property_tree::ptree gras::json_to_ptree(const std::string &s)
 {
     std::stringstream ss(s);
     boost::property_tree::ptree pt;
@@ -25,7 +26,7 @@ boost::property_tree::ptree json_to_ptree(const std::string &s)
 }
 
 //http://stackoverflow.com/questions/13464383/boost-property-write-json-incorrect-behaviour
-std::string ptree_to_json(const boost::property_tree::ptree &p)
+std::string gras::ptree_to_json(const boost::property_tree::ptree &p)
 {
     boost::regex exp("\"(null|true|false|[0-9]+(\\.[0-9]+)?)\"");
     std::stringstream ss;
-- 
cgit