rename JSON namespace to osrm::json to avoid namespace clash with V8

util/json_renderer.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -35,7 +35,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <osrm/json_container.hpp>
 
-namespace JSON
+namespace osrm
+{
+namespace json
 {
 
 struct Renderer : mapbox::util::static_visitor<>
@@ -179,6 +181,6 @@ inline void render(std::vector<char> &out, const Object &object)
     mapbox::util::apply_visitor(ArrayRenderer(out), value);
 }
 
-} // namespace JSON
-
+} // namespace json
+} // namespace osrm
 #endif // JSON_RENDERER_HPP

util/string_util.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

util/xml_renderer.hpp

@@ -32,7 +32,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <osrm/json_container.hpp>
 
-namespace JSON
+namespace osrm
+{
+namespace json
 {
 
 struct XMLToArrayRenderer : mapbox::util::static_visitor<>
@@ -135,6 +137,6 @@ template <class JSONObject> inline void gpx_render(std::vector<char> &out, const
     const std::string footer{"</rte></gpx>"};
     out.insert(out.end(), footer.begin(), footer.end());
 }
-} // namespace JSON
-
+} // namespace json
+} // namespace osrm
 #endif // XML_RENDERER_HPP