Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViktor <vng@Viktors-MacBook-Pro-2.local>2015-07-04 12:26:46 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:54:15 +0300
commit66c409971d994c60dcbef704c6d58799613658fb (patch)
tree0c0e1d03674f2dc2b3bd11f5e03fc3c97c0054b4 /coding/file_name_utils.hpp
parentc966bfed30e064149cf8f9c6aa06d9281a5a5c21 (diff)
Review fixes.
Diffstat (limited to 'coding/file_name_utils.hpp')
-rw-r--r--coding/file_name_utils.hpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/coding/file_name_utils.hpp b/coding/file_name_utils.hpp
index f738588acd..76629660c9 100644
--- a/coding/file_name_utils.hpp
+++ b/coding/file_name_utils.hpp
@@ -1,7 +1,7 @@
#pragma once
+#include "std/initializer_list.hpp"
#include "std/string.hpp"
-#include "std/vector.hpp"
namespace my
{
@@ -23,10 +23,8 @@ namespace my
/// Create full path from some folder using native folders separator
string JoinFoldersToPath(const string & folder, const string & file);
- string JoinFoldersToPath(const string & folder1, const string & folder2, const string & file);
- string JoinFoldersToPath(const string & folder1, const string & folder2, const string & folder3, const string & file);
- string JoinFoldersToPath(const vector<string> & folders, const string & file);
+ string JoinFoldersToPath(initializer_list<string> const & folders, const string & file);
- /// Add terminating slash, if it's not exist to the folder path string.
+ /// Add the terminating slash to the folder path string if it's not already there.
string AddSlashIfNeeded(string const & path);
}