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

common: s/boost::regex/std::regex/

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

diff --git a/src/common/address_helper.cc b/src/common/address_helper.cc
index 7ea9701e142e..8774892211da 100644
--- a/src/common/address_helper.cc
+++ b/src/common/address_helper.cc
@@ -8,20 +8,17 @@
  */
 
 #include <netdb.h>
+#include <regex>
 
 #include "common/address_helper.h"
-#include "boost/regex.hpp"
-
 
 // decode strings like "tcp://<host>:<port>"
 int entity_addr_from_url(entity_addr_t *addr /* out */, const char *url)
 {
-	using namespace boost;
-
-	regex expr("(tcp|rdma)://([^:]*):([\\d]+)");
-	cmatch m;
+	std::regex expr("(tcp|rdma)://([^:]*):([\\d]+)");
+	std::cmatch m;
 
-	if (regex_match(url, m, expr)) {
+	if (std::regex_match(url, m, expr)) {
 		string host(m[2].first, m[2].second);
 		string port(m[3].first, m[3].second);
 		addrinfo hints;
diff --git a/src/common/options.cc b/src/common/options.cc
index 19e88a10f0a6..fedbf9c75b6e 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -9,7 +9,7 @@
 #include "include/stringify.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/regex.hpp>
+#include <regex>
 
 // Definitions for enums
 #include "common/perf_counters.h"
@@ -5681,8 +5681,8 @@ static std::vector<Option> get_rbd_options() {
     .set_default("rbd")
     .set_description("default pool for storing new images")
     .set_validator([](std::string *value, std::string *error_message){
-      boost::regex pattern("^[^@/]+$");
-      if (!boost::regex_match (*value, pattern)) {
+      std::regex pattern("^[^@/]+$");
+      if (!std::regex_match (*value, pattern)) {
         *value = "rbd";
         *error_message = "invalid RBD default pool, resetting to 'rbd'";
       }
@@ -5693,8 +5693,8 @@ static std::vector<Option> get_rbd_options() {
     .set_default("")
     .set_description("default pool for storing data blocks for new images")
     .set_validator([](std::string *value, std::string *error_message){
-      boost::regex pattern("^[^@/]*$");
-      if (!boost::regex_match (*value, pattern)) {
+      std::regex pattern("^[^@/]*$");
+      if (!std::regex_match (*value, pattern)) {
         *value = "";
         *error_message = "ignoring invalid RBD data pool";
       }