summaryrefslogtreecommitdiffstats
path: root/src/rgw/rgw_policy_s3.cc
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2013-02-06 21:56:54 +0100
committerYehuda Sadeh <yehuda@inktank.com>2013-03-22 19:23:08 +0100
commit96ad9b149f22c08ad1510833f45d9afcb90d3289 (patch)
tree5c2887341c2141da697bc9beb042dd02f7c2b340 /src/rgw/rgw_policy_s3.cc
parentrgw: rgw_jsonparser changes (diff)
downloadceph-96ad9b149f22c08ad1510833f45d9afcb90d3289.tar.xz
ceph-96ad9b149f22c08ad1510833f45d9afcb90d3289.zip
moved rgw/rgw_json.* common/ceph_json.*
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Diffstat (limited to 'src/rgw/rgw_policy_s3.cc')
-rw-r--r--src/rgw/rgw_policy_s3.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rgw/rgw_policy_s3.cc b/src/rgw/rgw_policy_s3.cc
index c0a88b485b2..fac05f18884 100644
--- a/src/rgw/rgw_policy_s3.cc
+++ b/src/rgw/rgw_policy_s3.cc
@@ -1,8 +1,8 @@
#include <errno.h>
+#include "common/ceph_json.h"
#include "rgw_policy_s3.h"
-#include "rgw_json.h"
#include "rgw_common.h"
@@ -229,7 +229,7 @@ int RGWPolicy::check(RGWPolicyEnv *env, string& err_msg)
int RGWPolicy::from_json(bufferlist& bl, string& err_msg)
{
- RGWJSONParser parser;
+ JSONParser parser;
if (!parser.parse(bl.c_str(), bl.length())) {
err_msg = "Malformed JSON";