From: vsr Date: Tue, 26 Oct 2021 17:10:54 +0000 (+0300) Subject: std::regex does not work properly with gcc 4.8 X-Git-Tag: V9_8_0b1~1 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=890187d6e15e3e11cff8f2f6323eb656d9d51f33 std::regex does not work properly with gcc 4.8 --- diff --git a/src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx b/src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx index ec06d9885..b058e86a2 100644 --- a/src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx +++ b/src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx @@ -29,10 +29,10 @@ #include #include -#include #include // getenv, system #include +#include namespace boofs = boost::filesystem; #ifdef WIN32 @@ -203,12 +203,12 @@ namespace { {// round1 enum { SCHEME = 2, AUTHORITY = 4, PATH = 5 }; // sub-strings - std::regex urlRegex ( R"(^(([^:\/?#]+):)?(//([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?)", - std::regex::extended ); - std::smatch matchResult; + boost::regex urlRegex ( R"(^(([^:\/?#]+):)?(//([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?)", + boost::regex::extended ); + boost::smatch matchResult; libraryFile._isURL = false; - if ( std::regex_match( libraryFile._name, matchResult, urlRegex )) + if ( boost::regex_match( libraryFile._name, matchResult, urlRegex )) libraryFile._isURL = ( !matchResult.str( SCHEME ).empty() && !matchResult.str( AUTHORITY ).empty() && !matchResult.str( PATH ).empty() ); @@ -217,12 +217,12 @@ namespace return true; {// round2 enum { HOST = 2, PORT = 3, PATH = 4 }; // sub-strings - std::regex urlRegex ( R"(^(([^:\/?#]+):)?([^/]+)?(/[^#]*))", - std::regex::extended ); - std::smatch matchResult; + boost::regex urlRegex ( R"(^(([^:\/?#]+):)?([^/]+)?(/[^#]*))", + boost::regex::extended ); + boost::smatch matchResult; libraryFile._isURL = false; - if ( std::regex_match( libraryFile._name, matchResult, urlRegex )) + if ( boost::regex_match( libraryFile._name, matchResult, urlRegex )) libraryFile._isURL = ( !matchResult.str( HOST ).empty() && !matchResult.str( PORT ).empty() && !matchResult.str( PATH ).empty() );