Skip to content

Commit c6a119e

Browse files
authored
Regular merge (#21)
1 parent f81921d commit c6a119e

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

Frame/Source/Assignment/Utils.hpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
#pragma once
22

3-
#include <cfloat>
43
#include <filesystem>
5-
#include <string>
64

75
namespace Utils
86
{
97

10-
inline std::string PathFromRoot(std::string relativePath)
8+
inline std::string PathFromRoot(std::string_view relativePath)
119
{
12-
return (std::filesystem::path(FRAME_ROOT_PATH) / std::move(relativePath)).generic_string();
10+
return (std::filesystem::path(FRAME_ROOT_PATH) / relativePath).generic_string();
1311
}
1412

15-
inline std::string PathFromAsset(std::string relativePath)
13+
inline std::string PathFromAsset(std::string_view relativePath)
1614
{
17-
return (std::filesystem::path(FRAME_ASSET_PATH) / std::move(relativePath)).generic_string();
15+
return (std::filesystem::path(FRAME_ASSET_PATH) / relativePath).generic_string();
1816
}
1917

2018
inline bool FloatEqual(const float a, const float b, const float EPSILON = FLT_EPSILON)

0 commit comments

Comments
 (0)