Add boost::regex to support gcc 4.8

Signed-off-by: Isaac Hier <isaachier@gmail.com>

Author: isaachier

.travis.yml

@@ -12,7 +12,16 @@ matrix:
         - g++-6
         - lcov
     env:
-    - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
+    - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6 && COVERAGE=ON"
+  - os: linux
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - g++-4.8
+    env:
+    - MATRIX_EVAL="CC=gcc-4.8 && CXX=g++-4.8"
 branches:
   only:
   - master

CMakeLists.txt

@@ -59,8 +59,15 @@ endif()
 
 set(package_deps)
 
-hunter_add_package(Boost)
-find_package(Boost ${hunter_config} REQUIRED)
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND
+    CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
+    set(boost_components regex)
+    hunter_add_package(Boost regex)
+else()
+    set(boost_components)
+    hunter_add_package(Boost)
+endif()
+find_package(Boost ${hunter_config} REQUIRED ${boost_components})
 list(APPEND package_deps Boost)
 
 hunter_add_package(thrift)

cmake/Config.cmake.in

@@ -2,8 +2,7 @@
 
 set(package_deps @package_deps@)
 foreach(dep IN LISTS package_deps)
-    if(dep STREQUAL "OpenSSL" OR
-       dep STREQUAL "Threads")
+    if(dep STREQUAL "OpenSSL" OR dep STREQUAL "Threads")
         find_package(${dep} REQUIRED)
     elseif(dep STREQUAL "OpenTracing" OR
            dep STREQUAL "yaml-cpp")
@@ -13,6 +12,9 @@ foreach(dep IN LISTS package_deps)
     endif()
 endforeach()
 
+set(boost_components @boost_components@)
+find_package(Boost CONFIG REQUIRED ${boost_components})
+
 check_required_components("@PROJECT_NAME@")
 
 include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")

scripts/build.sh

@@ -21,7 +21,12 @@ function working() {
 
 mkdir -p build
 cd build || exit
-cmake -DCMAKE_BUILD_TYPE=Debug -DJAEGERTRACING_COVERAGE=ON ..
+if [ $COVERAGE != "" ]; then
+  cmake -DCMAKE_BUILD_TYPE=Debug -DJAEGERTRACING_COVERAGE=ON ..
+else
+  cmake -DCMAKE_BUILD_TYPE=Debug -DJAEGERTRACING_COVERAGE=OFF ..
+fi
+
 if make -j3 UnitTest; then
     true
 else

src/jaegertracing/net/URI.cpp

@@ -20,7 +20,8 @@
 #include <cstring>
 #include <iomanip>
 #include <iostream>
-#include <regex>
+
+#include "jaegertracing/utils/Regex.h"
 
 namespace jaegertracing {
 namespace net {
@@ -67,11 +68,11 @@ URI URI::parse(const std::string& uriStr)
 {
     // See https://tools.ietf.org/html/rfc3986 for explanation.
     URI uri;
-    std::regex uriRegex(
+    regex_namespace::regex uriRegex(
         "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?",
-        std::regex::extended);
-    std::smatch match;
-    std::regex_match(uriStr, match, uriRegex);
+        regex_namespace::regex::extended);
+    regex_namespace::smatch match;
+    regex_namespace::regex_match(uriStr, match, uriRegex);
 
     constexpr auto kSchemeIndex = 2;
     constexpr auto kAuthorityIndex = 4;

src/jaegertracing/net/http/Header.h

@@ -22,6 +22,7 @@
 #include <string>
 
 #include "jaegertracing/net/http/Error.h"
+#include "jaegertracing/utils/Regex.h"
 
 namespace jaegertracing {
 namespace net {
@@ -73,14 +74,15 @@ inline std::istream& readLineCRLF(std::istream& in, std::string& line)
 
 inline void readHeaders(std::istream& in, std::vector<Header>& headers)
 {
-    const std::regex headerPattern("([^:]+):(.+)$");
+    const regex_namespace::regex headerPattern("([^:]+):(.+)$");
     std::string line;
-    std::smatch match;
+    regex_namespace::smatch match;
     while (readLineCRLF(in, line)) {
         if (line.empty()) {
             break;
         }
-        if (!std::regex_match(line, match, headerPattern) || match.size() < 3) {
+        if (!regex_namespace::regex_match(line, match, headerPattern) ||
+            match.size() < 3) {
             throw ParseError::make("header", line);
         }
         headers.emplace_back(Header(match[1], match[2]));

src/jaegertracing/net/http/Request.cpp

@@ -16,18 +16,20 @@
 
 #include "jaegertracing/net/http/Request.h"
 
+#include "jaegertracing/utils/Regex.h"
+
 namespace jaegertracing {
 namespace net {
 namespace http {
 
 Request Request::parse(std::istream& in)
 {
-    const std::regex requestLinePattern(
+    const regex_namespace::regex requestLinePattern(
         "([A-Z]+) ([^ ]+) HTTP/([0-9]\\.[0-9])$");
     std::string line;
-    std::smatch match;
+    regex_namespace::smatch match;
     if (!readLineCRLF(in, line) ||
-        !std::regex_match(line, match, requestLinePattern) ||
+        !regex_namespace::regex_match(line, match, requestLinePattern) ||
         match.size() < 4) {
         throw ParseError::make("request line", line);
     }

src/jaegertracing/net/http/Response.cpp

@@ -25,18 +25,20 @@
 
 #include "jaegertracing/Constants.h"
 #include "jaegertracing/net/Socket.h"
+#include "jaegertracing/utils/Regex.h"
 
 namespace jaegertracing {
 namespace net {
 namespace http {
 
 Response Response::parse(std::istream& in)
 {
-    const std::regex statusLinePattern("HTTP/([0-9]\\.[0-9]) ([0-9]+) (.+)$");
+    const regex_namespace::regex statusLinePattern(
+        "HTTP/([0-9]\\.[0-9]) ([0-9]+) (.+)$");
     std::string line;
-    std::smatch match;
+    regex_namespace::smatch match;
     if (!readLineCRLF(in, line) ||
-        !std::regex_match(line, match, statusLinePattern) || match.size() < 4) {
+        !regex_namespace::regex_match(line, match, statusLinePattern) || match.size() < 4) {
         throw ParseError::make("status line", line);
     }
     Response response;

src/jaegertracing/testutils/MockAgent.cpp

@@ -16,7 +16,6 @@
 
 #include "jaegertracing/testutils/MockAgent.h"
 
-#include <regex>
 #include <thread>
 
 #include <thrift/protocol/TCompactProtocol.h>
@@ -28,6 +27,7 @@
 #include "jaegertracing/net/http/Request.h"
 #include "jaegertracing/net/http/Response.h"
 #include "jaegertracing/utils/ErrorUtil.h"
+#include "jaegertracing/utils/Regex.h"
 #include "jaegertracing/utils/UDPClient.h"
 
 namespace jaegertracing {
@@ -139,7 +139,7 @@ void MockAgent::serveHTTP(std::promise<void>& started)
     _servingHTTP = true;
     started.set_value();
 
-    const std::regex servicePattern("[?&]service=([^?&]+)");
+    const regex_namespace::regex servicePattern("[?&]service=([^?&]+)");
     while (isServingHTTP()) {
         constexpr auto kBufferSize = 256;
         std::array<char, kBufferSize> buffer;
@@ -167,11 +167,12 @@ void MockAgent::serveHTTP(std::promise<void>& started)
                            _httpAddress.authority() + "/baggageRestrictions")) {
                 resource = Resource::kBaggage;
             }
-            std::smatch match;
-            if (!std::regex_search(target, match, servicePattern)) {
+            regex_namespace::smatch match;
+            if (!regex_namespace::regex_search(target, match, servicePattern)) {
                 throw net::http::ParseError("no 'service' parameter");
             }
-            if (std::regex_search(match.suffix().str(), servicePattern)) {
+            if (regex_namespace::regex_search(
+                    match.suffix().str(), servicePattern)) {
                 throw net::http::ParseError(
                     "'service' parameter must occur only once");
             }

src/jaegertracing/utils/Regex.cpp

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2017 Uber Technologies, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "jaegertracing/utils/Regex.h"

src/jaegertracing/utils/Regex.h

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2017 Uber Technologies, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JAEGERTRACING_UTILS_REGEX_H
+#define JAEGERTRACING_UTILS_REGEX_H
+
+#if (!defined(__GNUC__) || \
+     defined(__clang__) || \
+     __GNUC__ > 4 || \
+     __GNUC_MINOR__ > 8)
+#define JAEGERTRACING_USE_STD_REGEX 1
+#else
+#define JAEGERTRACING_USE_STD_REGEX 0
+#endif
+
+#if JAEGERTRACING_USE_STD_REGEX
+#include <regex>
+#else
+#include <boost/regex.hpp>
+#endif
+
+#if JAEGERTRACING_USE_STD_REGEX
+#define regex_namespace std
+#else
+#define regex_namespace boost
+#endif
+
+#endif  // JAEGERTRACING_UTILS_REGEX_H