From: Kefu Chai <kchai@redhat.com>
Date: Fri, 8 Dec 2017 06:07:52 +0000 (+0800)
Subject: rgw: s/boost::regex/std::regex/
X-Git-Tag: v13.0.2~575^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5ad86335bb79bb6b65f9fbcac2bb8c6ca8a4979e;p=ceph.git

rgw: s/boost::regex/std::regex/

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/rgw/rgw_sync_trace.cc b/src/rgw/rgw_sync_trace.cc
index d4298f691eebe..5f62c283d46cc 100644
--- a/src/rgw/rgw_sync_trace.cc
+++ b/src/rgw/rgw_sync_trace.cc
@@ -1,7 +1,7 @@
 #ifndef CEPH_RGW_SYNC_TRACE_H
 #define CEPH_RGW_SYNC_TRACE_H
 
-#include <boost/regex.hpp>
+#include <regex>
 
 #include "common/debug.h"
 #include "common/ceph_json.h"
@@ -92,8 +92,8 @@ RGWSyncTraceNodeRef RGWSyncTraceManager::add_node(RGWSyncTraceNode *node)
 bool RGWSyncTraceNode::match(const string& search_term, bool search_history)
 {
   try {
-    boost::regex expr(search_term);
-    boost::smatch m;
+    std::regex expr(search_term);
+    std::smatch m;
 
     if (regex_search(prefix, m, expr)) {
       return true;
@@ -110,10 +110,8 @@ bool RGWSyncTraceNode::match(const string& search_term, bool search_history)
         return true;
       }
     }
-  } catch (boost::bad_expression const& e) {
+  } catch (const std::regex_error& e) {
     ldout(cct, 5) << "NOTICE: sync trace: bad expression: bad regex search term" << dendl;
-  } catch (...) {
-    ldout(cct, 5) << "NOTICE: sync trace: regex_search() threw exception" << dendl;
   }
 
   return false;