Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions parser/src/pluginhandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void PluginHandler::loadPlugins(std::vector<std::string>& skipParserList_)
++dirIter)
{
if (fs::is_regular_file(dirIter->status()) &&
fs::extension(*dirIter) == util::DynamicLibrary::extension())
fs::path(*dirIter).extension() == util::DynamicLibrary::extension())
{
std::string filename = getPluginName(dirIter->path());

Expand Down Expand Up @@ -85,7 +85,7 @@ std::vector<std::string> PluginHandler::getPluginNames() const
++dirIter)
{
if (fs::is_regular_file(dirIter->status()) &&
fs::extension(*dirIter) == util::DynamicLibrary::extension())
fs::path(*dirIter).extension() == util::DynamicLibrary::extension())
{
plugins.push_back(getPluginName(dirIter->path()));
}
Expand Down
6 changes: 3 additions & 3 deletions plugins/cpp/parser/src/cppparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ bool CppParser::isSourceFile(const std::string& file_) const
const std::vector<std::string> cppExts{
".c", ".cc", ".cpp", ".cxx", ".o", ".so", ".a"};

std::string ext = fs::extension(file_);
std::string ext = fs::path(file_).extension().string();
std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);

return std::find(cppExts.begin(), cppExts.end(), ext) != cppExts.end();
Expand Down Expand Up @@ -209,7 +209,7 @@ std::map<std::string, std::string> CppParser::extractInputOutputs(
{
for (const std::string& src : sources)
{
std::string extension = fs::extension(src);
std::string extension = fs::path(src).extension().string();
inToOut[src] = src.substr(0, src.size() - extension.size() - 1) + ".o";
}
}
Expand All @@ -232,7 +232,7 @@ model::BuildActionPtr CppParser::addBuildAction(

model::BuildActionPtr buildAction(new model::BuildAction);

std::string extension = fs::extension(command_.Filename);
auto extension = fs::path(command_.Filename).extension().string();

buildAction->command = boost::algorithm::join(command_.CommandLine, " ");
buildAction->type
Expand Down
2 changes: 1 addition & 1 deletion plugins/cpp/service/src/filediagram.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ util::Graph::Node FileDiagram::addNode(
}
else if (fileInfo_.type == "CPP")
{
std::string ext = boost::filesystem::extension(fileInfo_.path);
std::string ext = boost::filesystem::path(fileInfo_.path).extension().string();
std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);

if (ext == ".cpp" || ext == ".cxx" || ext == ".cc" || ext == ".c")
Expand Down
2 changes: 1 addition & 1 deletion plugins/dummy/parser/src/dummyparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ DummyParser::DummyParser(ParserContext& ctx_): AbstractParser(ctx_)

bool DummyParser::accept(const std::string& path_)
{
std::string ext = boost::filesystem::extension(path_);
auto ext = boost::filesystem::path(path_).extension().string();
return ext == ".dummy";
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/git/parser/src/gitparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ util::DirIterCallback GitParser::getParserCallback()
boost::property_tree::ptree pt;
std::string repoFile(versionDataDir + "/repositories.txt");

if (boost::filesystem::is_regular(repoFile))
if (boost::filesystem::is_regular_file(repoFile))
boost::property_tree::read_ini(repoFile, pt);

pt.put(repoId + ".name", path.filename().string());
Expand Down
2 changes: 1 addition & 1 deletion plugins/git/service/src/gitservice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ void GitServiceHandler::getRepositoryList(std::vector<GitRepository>& return_)
std::string repoFile(versionDataDir.string() + "/repositories.txt");
boost::property_tree::ptree pt;

if (!fs::is_regular(repoFile))
if (!fs::is_regular_file(repoFile))
{
LOG(warning) << "Repository file not found in data directory: " << repoFile;
return;
Expand Down
2 changes: 1 addition & 1 deletion plugins/search/parser/src/searchparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ bool SearchParser::shouldHandle(const std::string& path_)
{
//--- The file is not regular. ---//

if (!fs::is_regular(path_))
if (!fs::is_regular_file(path_))
return false;

//--- The file is excluded by suffix. ---//
Expand Down
2 changes: 1 addition & 1 deletion webserver/include/webserver/pluginhandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class PluginHandler
for (fs::directory_iterator dirIter(path_); dirIter != endIter; ++dirIter)
{
if (fs::is_regular_file(dirIter->status())
&& fs::extension(*dirIter) == util::DynamicLibrary::extension())
&& fs::path(*dirIter).extension() == util::DynamicLibrary::extension())
{
_dynamicLibraries.emplace_back(util::DynamicLibraryPtr(
new util::DynamicLibrary(dirIter->path().string())));
Expand Down