diff options
author | Sergey Magidovich <mgsergio@mapswithme.com> | 2016-03-11 17:34:10 +0300 |
---|---|---|
committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:56:28 +0300 |
commit | 9cec925752462dd806bce66c2c8cbff6e9144666 (patch) | |
tree | 6e779e374d4f782b7c616ae0ed6ae3f3aedd4764 /platform | |
parent | f9e8c97c6fb55926ff906e0320cf68c618dc02a3 (diff) |
Code review. Fix data loss.
Diffstat (limited to 'platform')
-rw-r--r-- | platform/platform.cpp | 10 | ||||
-rw-r--r-- | platform/platform.hpp | 2 | ||||
-rw-r--r-- | platform/platform_tests/platform_test.cpp | 11 |
3 files changed, 0 insertions, 23 deletions
diff --git a/platform/platform.cpp b/platform/platform.cpp index d3993614de..ce7353e525 100644 --- a/platform/platform.cpp +++ b/platform/platform.cpp @@ -94,16 +94,6 @@ bool Platform::RmDirRecursively(string const & dirName) return res; } -string Platform::PathJoin(vector<string> const & parts) -{ -#ifdef OMIM_OS_WINDOWS - auto const delimiter = "\\"; -#else - auto const delimiter = "/"; -#endif - return strings::JoinStrings(parts, delimiter); -} - string Platform::ReadPathForFile(string const & file, string searchScope) const { if (searchScope.empty()) diff --git a/platform/platform.hpp b/platform/platform.hpp index 6daace189e..a909d76754 100644 --- a/platform/platform.hpp +++ b/platform/platform.hpp @@ -115,8 +115,6 @@ public: /// @note If function fails, directory can be partially removed. static bool RmDirRecursively(string const & dirName); - static string PathJoin(vector<string> const & parts); - /// @return path for directory with temporary files with slash at the end string TmpDir() const { return m_tmpDir; } /// @return full path to file in the temporary directory diff --git a/platform/platform_tests/platform_test.cpp b/platform/platform_tests/platform_test.cpp index 70f8eda357..d791c14fb7 100644 --- a/platform/platform_tests/platform_test.cpp +++ b/platform/platform_tests/platform_test.cpp @@ -258,14 +258,3 @@ UNIT_TEST(IsSingleMwm) TEST(!version::IsSingleMwm(version::FOR_TESTING_TWO_COMPONENT_MWM1), ()); TEST(!version::IsSingleMwm(version::FOR_TESTING_TWO_COMPONENT_MWM2), ()); } - -UNIT_TEST(PathJoin) -{ -#ifdef OMIM_OS_WINDOWS - TEST_EQUAL("foo\\bar", Platform::PathJoin({"foo", "bar"}), ()); - TEST_EQUAL("foo\\bar\\baz", Platform::PathJoin({"foo", "bar", "baz"}), ()); -#else - TEST_EQUAL("foo/bar", Platform::PathJoin({"foo", "bar"}), ()); - TEST_EQUAL("foo/bar/baz", Platform::PathJoin({"foo", "bar", "baz"}), ()); -#endif -} |