From e75974d4f8de587cb5bb2240914c24fce228f9a8 Mon Sep 17 00:00:00 2001
From: Norihiro Watanabe <norihiro.watanabe@ufz.de>
Date: Thu, 23 Jun 2016 07:10:01 +0200
Subject: [PATCH] take initializer_list in FileFinder constructor
---
BaseLib/FileFinder.cpp | 5 +++--
BaseLib/FileFinder.h | 9 +++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/BaseLib/FileFinder.cpp b/BaseLib/FileFinder.cpp
index 46aca453f5d..dde0f1299d2 100644
--- a/BaseLib/FileFinder.cpp
+++ b/BaseLib/FileFinder.cpp
@@ -27,10 +27,11 @@ FileFinder::FileFinder()
addDirectory(".");
}
-FileFinder::FileFinder(std::string const& dir)
+FileFinder::FileFinder(std::initializer_list<std::string> dirs)
{
addDirectory(".");
- addDirectory(dir);
+ for (auto const& dir : dirs)
+ addDirectory(dir);
}
void FileFinder::addDirectory(std::string const& dir)
diff --git a/BaseLib/FileFinder.h b/BaseLib/FileFinder.h
index 23ede19833e..814f27883b5 100644
--- a/BaseLib/FileFinder.h
+++ b/BaseLib/FileFinder.h
@@ -15,6 +15,7 @@
#ifndef FILEFINDER_H
#define FILEFINDER_H
+#include <initializer_list>
#include <string>
#include <vector>
@@ -29,15 +30,15 @@ namespace BaseLib
class FileFinder
{
public:
- /// Constructor having current directory as the search-space
+ /// Constructor having current directory (.) as the search-space
FileFinder();
/**
- * Construct with the given directory paths in addition to current directory
+ * Construct with the given directory paths in addition to current directory (.)
*
- * @param dirs a vector of directory paths to the search-space
+ * @param dirs an initializer list of additional directory paths to the search-space
*/
- explicit FileFinder(std::string const& dir);
+ FileFinder(std::initializer_list<std::string> dirs);
/**
* \brief Adds another directory to the search-space.
--
GitLab