Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
K
KWSys
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sylvain Joubert
KWSys
Commits
81f5e0a8
Commit
81f5e0a8
authored
11 years ago
by
Ben Boeckel
Browse files
Options
Downloads
Patches
Plain Diff
Glob: Accept a string in Glob::AddExpression
Change-Id: I5fc21da7073177768088a7298d84632c43f70bd6
parent
1d531416
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Glob.cxx
+4
-4
4 additions, 4 deletions
Glob.cxx
Glob.hxx.in
+1
-1
1 addition, 1 deletion
Glob.hxx.in
with
5 additions
and
5 deletions
Glob.cxx
+
4
−
4
View file @
81f5e0a8
...
...
@@ -441,7 +441,7 @@ bool Glob::FindFiles(const kwsys_stl::string& inexpr)
{
if
(
!
cexpr
.
empty
()
)
{
this
->
AddExpression
(
cexpr
.
c_str
()
);
this
->
AddExpression
(
cexpr
);
}
cexpr
=
""
;
}
...
...
@@ -452,7 +452,7 @@ bool Glob::FindFiles(const kwsys_stl::string& inexpr)
}
if
(
!
cexpr
.
empty
()
)
{
this
->
AddExpression
(
cexpr
.
c_str
()
);
this
->
AddExpression
(
cexpr
);
}
// Handle network paths
...
...
@@ -468,11 +468,11 @@ bool Glob::FindFiles(const kwsys_stl::string& inexpr)
}
//----------------------------------------------------------------------------
void
Glob
::
AddExpression
(
const
char
*
expr
)
void
Glob
::
AddExpression
(
const
kwsys_stl
::
string
&
expr
)
{
this
->
Internals
->
Expressions
.
push_back
(
kwsys
::
RegularExpression
(
this
->
PatternToRegex
(
expr
)
.
c_str
()
));
this
->
PatternToRegex
(
expr
)));
}
//----------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
Glob.hxx.in
+
1
−
1
View file @
81f5e0a8
...
...
@@ -91,7 +91,7 @@ protected:
const kwsys_stl::string& dir);
//! Add regular expression
void AddExpression(const
char*
expr);
void AddExpression(const
kwsys_stl::string&
expr);
//! Add a file to the list
void AddFile(kwsys_stl::vector<kwsys_stl::string>& files, const kwsys_stl::string& file);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment