mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-24 23:40:34 +05:00
std::regex does not work properly with gcc 4.8
This commit is contained in:
parent
300e5f1bc5
commit
890187d6e1
@ -29,10 +29,10 @@
|
||||
#include <Basics_DirUtils.hxx>
|
||||
#include <Basics_Utils.hxx>
|
||||
|
||||
#include <regex>
|
||||
#include <cstdlib> // getenv, system
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/regex.hpp>
|
||||
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() );
|
||||
|
Loading…
Reference in New Issue
Block a user