From f773cf9fb96e25d064f43cffdc893ac905d91f15 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Sat, 28 Sep 2019 13:13:41 +0200
Subject: uhd: Replace boost::regex with std::regex
boost::regex was a requirement until the minimum version of gcc was
increased. Since it is at version 5.3 now, using Boost.Regex is no
longer necessary.
This change is a pure search-and-replace; Boost and std versions of
regex are compatible and use the same syntax.
---
host/lib/usrp/fe_connection.cpp | 8 ++++----
host/lib/usrp/gps_ctrl.cpp | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'host/lib/usrp')
diff --git a/host/lib/usrp/fe_connection.cpp b/host/lib/usrp/fe_connection.cpp
index 0c2574ed3..8e3c0c88b 100644
--- a/host/lib/usrp/fe_connection.cpp
+++ b/host/lib/usrp/fe_connection.cpp
@@ -7,7 +7,7 @@
#include <uhd/usrp/fe_connection.hpp>
#include <uhd/exception.hpp>
-#include <boost/regex.hpp>
+#include <regex>
#include <uhd/utils/math.hpp>
using namespace uhd::usrp;
@@ -21,9 +21,9 @@ fe_connection_t::fe_connection_t(
}
fe_connection_t::fe_connection_t(const std::string& conn_str, double if_freq) {
- static const boost::regex conn_regex("([IQ])(b?)(([IQ])(b?))?");
- boost::cmatch matches;
- if (boost::regex_match(conn_str.c_str(), matches, conn_regex)) {
+ static const std::regex conn_regex("([IQ])(b?)(([IQ])(b?))?");
+ std::cmatch matches;
+ if (std::regex_match(conn_str.c_str(), matches, conn_regex)) {
if (matches[3].length() == 0) {
//Connection in {I, Q, Ib, Qb}
_sampling_mode = REAL;
diff --git a/host/lib/usrp/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp
index 717654151..f9e03b16a 100644
--- a/host/lib/usrp/gps_ctrl.cpp
+++ b/host/lib/usrp/gps_ctrl.cpp
@@ -14,7 +14,7 @@
#include <boost/thread/thread.hpp>
#include <boost/tokenizer.hpp>
#include <boost/format.hpp>
-#include <boost/regex.hpp>
+#include <regex>
#include <boost/thread/mutex.hpp>
#include <boost/date_time.hpp>
#include <boost/tuple/tuple.hpp>
@@ -137,8 +137,8 @@ private:
}
const std::list<std::string> keys{"GPGGA", "GPRMC", "SERVO"};
- static const boost::regex servo_regex("^\\d\\d-\\d\\d-\\d\\d.*$");
- static const boost::regex gp_msg_regex("^\\$GP.*,\\*[0-9A-F]{2}$");
+ static const std::regex servo_regex("^\\d\\d-\\d\\d-\\d\\d.*$");
+ static const std::regex gp_msg_regex("^\\$GP.*,\\*[0-9A-F]{2}$");
std::map<std::string,std::string> msgs;
// Get all GPSDO messages available
@@ -162,11 +162,11 @@ private:
}
// Look for SERVO message
- if (boost::regex_search(msg, servo_regex, boost::regex_constants::match_continuous))
+ if (std::regex_search(msg, servo_regex, std::regex_constants::match_continuous))
{
msgs["SERVO"] = msg;
}
- else if (boost::regex_match(msg, gp_msg_regex) and is_nmea_checksum_ok(msg))
+ else if (std::regex_match(msg, gp_msg_regex) and is_nmea_checksum_ok(msg))
{
msgs[msg.substr(1,5)] = msg;
}
--
cgit v1.2.3