projects
/
shibboleth
/
cpp-xmltooling.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6bebd3b
)
Remove extra path resolver call in catalog load.
author
Scott Cantor
<cantor.2@osu.edu>
Wed, 12 Sep 2012 18:51:22 +0000
(18:51 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Wed, 12 Sep 2012 18:51:22 +0000
(18:51 +0000)
xmltooling/util/ParserPool.cpp
patch
|
blob
|
history
diff --git
a/xmltooling/util/ParserPool.cpp
b/xmltooling/util/ParserPool.cpp
index
1176617
..
78d64cc
100644
(file)
--- a/
xmltooling/util/ParserPool.cpp
+++ b/
xmltooling/util/ParserPool.cpp
@@
-247,10
+247,8
@@
bool ParserPool::loadCatalogs(const char* pathnames)
string temp(pathnames);
vector<string> catpaths;
split(catpaths, temp, is_any_of(PATH_SEPARATOR_STR), algorithm::token_compress_on);
string temp(pathnames);
vector<string> catpaths;
split(catpaths, temp, is_any_of(PATH_SEPARATOR_STR), algorithm::token_compress_on);
- for (vector<string>::iterator i = catpaths.begin(); i != catpaths.end(); ++i) {
- XMLToolingConfig::getConfig().getPathResolver()->resolve(*i, PathResolver::XMLTOOLING_XML_FILE);
- loadCatalog(i->c_str());
- }
+ static bool (ParserPool::* lc)(const char*) = &ParserPool::loadCatalog;
+ for_each(catpaths.begin(), catpaths.end(), boost::bind(lc, this, boost::bind(&string::c_str, _1)));
return !catpaths.empty();
}
return !catpaths.empty();
}