Format using clang-format

This commit is contained in:
blahpy 2020-09-10 10:35:29 +12:00
parent 9f1d6792e2
commit efe94dca79
3 changed files with 18 additions and 20 deletions

View file

@ -1,13 +1,13 @@
#include "FileUtil.h"
#include <iostream>
#include <stdio.h> /* defines FILENAME_MAX */
#include <stdio.h> /* defines FILENAME_MAX */
#ifdef _WIN32
#include <direct.h>
#define GetCurrentDir _getcwd
#include <direct.h>
#define GetCurrentDir _getcwd
#else
#include <unistd.h>
#define GetCurrentDir getcwd
#include <unistd.h>
#define GetCurrentDir getcwd
#endif
std::string FileUtil::GetCurrentWorkingDir() {
@ -17,20 +17,20 @@ std::string FileUtil::GetCurrentWorkingDir() {
return current_working_dir;
}
std::string FileUtil::get_file_path(std::vector<std::string> input) {
std::string FileUtil::get_file_path(const std::vector<std::string>& input) {
std::string currentPath = FileUtil::GetCurrentWorkingDir(); // std::filesystem::current_path();
char dirSeparator;
#ifdef _WIN32
dirSeparator = '\\';
#else
dirSeparator = '/';
#endif
#ifdef _WIN32
dirSeparator = '\\';
#else
dirSeparator = '/';
#endif
std::string filePath = currentPath;
for (int i = 0; i < input.size(); i++) {
filePath = filePath + dirSeparator + input[i];
}
for (int i = 0; i < input.size(); i++) {
filePath = filePath + dirSeparator + input[i];
}
return filePath;
}

View file

@ -2,8 +2,7 @@
#include <string>
#include <vector>
namespace FileUtil
{
std::string GetCurrentWorkingDir();
std::string get_file_path(std::vector<std::string> input);
}
namespace FileUtil {
std::string GetCurrentWorkingDir();
std::string get_file_path(std::vector<std::string> input);
} // namespace FileUtil

View file

@ -4,7 +4,6 @@
#include <vector>
TEST(FileUtil, valid_path) {
std::vector<std::string> test = {"cabbage", "banana", "apple"};
std::string sampleString = FileUtil::get_file_path(test);
// std::cout << sampleString << std::endl;