Skip to content

Commit af7bb87

Browse files
Frodo45127Frodo45127
committed
Fixed linking errors.
1 parent c122252 commit af7bb87

File tree

5 files changed

+45
-38
lines changed

5 files changed

+45
-38
lines changed

‎CommonLibs/Logger/Logger.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,4 +171,11 @@ namespace logger {
171171
{
172172
Print(str + L"\n", color);
173173
}
174+
175+
// static member variable defines
176+
std::wstring Logger::sm_loggingFolder;
177+
std::wstring Logger::sm_logFileName;
178+
std::wstring Logger::sm_prefix;
179+
SystemClockChecker Logger::m_globalClock;
180+
std::unique_ptr<Logger> Logger::m_poInstance;
174181
}

‎CommonLibs/Utils/MathUtils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
namespace utils {
66

7-
constexpr float ToDegrees(float radians) {
7+
float ToDegrees(float radians) {
88
return radians * (180.0f / DirectX::XM_PI);
99
}
1010

11-
constexpr float ToRadians(float degrees) {
11+
float ToRadians(float degrees) {
1212
return degrees * (DirectX::XM_PI / 180.0f);
1313
}
1414

‎CommonLibs/Utils/MathUtils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace utils {
66

7-
constexpr float ToDegrees(float radians);
8-
constexpr float ToRadians(float degrees);
7+
float ToDegrees(float radians);
8+
float ToRadians(float degrees);
99

1010
/// <summary>
1111
/// Return true at a certain pronanality

‎CommonLibs/Utils/StrUtils.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace utils {
2727
return converterX.from_bytes(str);
2828
}
2929

30-
static std::wstring ToWString(DirectX::XMFLOAT3 _v3)
30+
std::wstring ToWString(DirectX::XMFLOAT3 _v3)
3131
{
3232
return
3333
L"(" +
@@ -36,7 +36,7 @@ namespace utils {
3636
std::to_wstring(_v3.z) + L" ) ";
3737
}
3838

39-
static std::wstring ToWString(DirectX::XMFLOAT4 _v4)
39+
std::wstring ToWString(DirectX::XMFLOAT4 _v4)
4040
{
4141
return
4242
L"(" +
@@ -46,7 +46,7 @@ namespace utils {
4646
std::to_wstring(_v4.w) + L" ) ";
4747
}
4848

49-
static std::wstring decToHexW(int dec)
49+
std::wstring decToHexW(int dec)
5050
{
5151
std::wostringstream ss;
5252
ss << std::hex << dec;
@@ -58,13 +58,13 @@ namespace utils {
5858
// Functions for character manipulation
5959
//---------------------------------------------------------------------//
6060

61-
inline wchar_t ToLower(wchar_t ch)
61+
wchar_t ToLower(wchar_t ch)
6262
{
6363
using namespace std;
6464
return static_cast<wchar_t>(std::towlower(static_cast<unsigned short>(ch)));
6565
}
6666

67-
inline wchar_t ToUpper(wchar_t ch)
67+
wchar_t ToUpper(wchar_t ch)
6868
{
6969
using namespace std;
7070
return static_cast<wchar_t>(std::towupper(static_cast<unsigned short>(ch)));
@@ -74,7 +74,7 @@ namespace utils {
7474
// Functions for string manipulation
7575
//---------------------------------------------------------------------//
7676

77-
inline std::wstring ToLower(std::wstring s)
77+
std::wstring ToLower(std::wstring s)
7878
{
7979
std::transform(s.begin(), s.end(), s.begin(),
8080
[](wchar_t c) {
@@ -85,7 +85,7 @@ namespace utils {
8585
return s;
8686
}
8787

88-
inline std::wstring ToUpper(std::wstring s)
88+
std::wstring ToUpper(std::wstring s)
8989
{
9090
std::transform(s.begin(), s.end(), s.begin(),
9191
[](wchar_t c) {
@@ -96,7 +96,7 @@ namespace utils {
9696
return s;
9797
}
9898

99-
inline std::string ToUpper(std::string s)
99+
std::string ToUpper(std::string s)
100100
{
101101
std::transform(s.begin(), s.end(), s.begin(),
102102
[](unsigned char c) { return std::toupper(c); } // correct
@@ -106,7 +106,7 @@ namespace utils {
106106
}
107107

108108
template<typename T_it>
109-
static inline void SequenceToLower(T_it begin, T_it end)
109+
void SequenceToLower(T_it begin, T_it end)
110110
{
111111
// Convert to upper: clear the '32' bit, 0x20 in hex. And with the
112112
// inverted bit std::string (~).
@@ -115,15 +115,15 @@ namespace utils {
115115
}
116116

117117
template<typename T_it>
118-
static inline void SequenceToUpper(T_it begin, T_it end)
118+
void SequenceToUpper(T_it begin, T_it end)
119119
{
120120
// Convert to upper: clear the '32' bit, 0x20 in hex. And with the
121121
// inverted bit std::string (~).
122122
for (auto it = begin; it != end; ++it)
123123
*it &= ~0x20;
124124
}
125125

126-
static std::vector<std::wstring> DissolveStringBytDelimitersFast(const std::wstring& _strInput, const wchar_t chDelimiterChar = L' ')
126+
std::vector<std::wstring> DissolveStringBytDelimitersFast(const std::wstring& _strInput, const wchar_t chDelimiterChar = L' ')
127127
{
128128
std::wistringstream ss(_strInput);
129129
std::wstring strTempDest;
@@ -137,7 +137,7 @@ namespace utils {
137137
return vecStringOut;
138138
}
139139

140-
static std::vector<std::wstring> DissolveStringBytDelimiters(const std::wstring& _path, const std::wstring& delimiters)
140+
std::vector<std::wstring> DissolveStringBytDelimiters(const std::wstring& _path, const std::wstring& delimiters)
141141
{
142142
// lamda for checking if any of chars
143143
auto isDelimiter = [&](wchar_t ch) -> bool
@@ -177,7 +177,7 @@ namespace utils {
177177
}
178178
}
179179

180-
static std::vector<std::wstring> split(const std::wstring& s, wchar_t delim) {
180+
std::vector<std::wstring> split(const std::wstring& s, wchar_t delim) {
181181
std::vector<std::wstring> elems;
182182
split(s, delim, std::back_inserter(elems));
183183
return elems;
@@ -187,12 +187,12 @@ namespace utils {
187187
// Functions for comparison
188188
//---------------------------------------------------------------------//
189189

190-
inline bool CompareNoCase(const std::wstring& str1, const std::wstring& str2)
190+
bool CompareNoCase(const std::wstring& str1, const std::wstring& str2)
191191
{
192192
return ToLower(str1) == ToLower(str2);
193193
}
194194

195-
inline bool CompareExtension(const std::wstring& str1, const std::wstring& str2)
195+
bool CompareExtension(const std::wstring& str1, const std::wstring& str2)
196196
{
197197
return CompareNoCase(GetFileExtension(str1), GetFileExtension(str2));
198198
}
@@ -201,7 +201,7 @@ namespace utils {
201201
// Functions for path (string) manipulation
202202
//---------------------------------------------------------------------//
203203

204-
static std::wstring ToForwardSlash(const std::wstring& _strInput)
204+
std::wstring ToForwardSlash(const std::wstring& _strInput)
205205
{
206206
std::wstring tempString = _strInput;
207207
for (auto& ch : tempString)
@@ -215,7 +215,7 @@ namespace utils {
215215
return tempString;
216216
}
217217

218-
static std::wstring ToLowerAndBackSlash(const std::wstring& _strInput)
218+
std::wstring ToLowerAndBackSlash(const std::wstring& _strInput)
219219
{
220220
std::wstring strOut = _strInput;
221221

‎CommonLibs/Utils/StrUtils.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,36 @@ namespace utils {
1616

1717
std::wstring ToWString(const std::string& str);
1818
std::string ToString(const std::wstring& wstr);
19-
static std::wstring ToWString(DirectX::XMFLOAT3 _v3);
20-
static std::wstring ToWString(DirectX::XMFLOAT4 _v4);
19+
std::wstring ToWString(DirectX::XMFLOAT3 _v3);
20+
std::wstring ToWString(DirectX::XMFLOAT4 _v4);
2121

22-
static std::wstring decToHexW(int dec);
22+
std::wstring decToHexW(int dec);
2323

24-
inline wchar_t ToLower(wchar_t ch);
25-
inline wchar_t ToUpper(wchar_t ch);
24+
wchar_t ToLower(wchar_t ch);
25+
wchar_t ToUpper(wchar_t ch);
2626

27-
inline std::wstring ToLower(std::wstring s);
28-
inline std::wstring ToUpper(std::wstring s);
29-
inline std::string ToUpper(std::string s);
27+
std::wstring ToLower(std::wstring s);
28+
std::wstring ToUpper(std::wstring s);
29+
std::string ToUpper(std::string s);
3030

3131
template<typename T_it>
32-
static inline void SequenceToLower(T_it begin, T_it end);
32+
void SequenceToLower(T_it begin, T_it end);
3333

3434
template<typename T_it>
35-
static inline void SequenceToUpper(T_it begin, T_it end);
35+
void SequenceToUpper(T_it begin, T_it end);
3636

37-
static std::vector<std::wstring> DissolveStringBytDelimitersFast(const std::wstring& _strInput, const wchar_t chDelimiterChar);
38-
static std::vector<std::wstring> DissolveStringBytDelimiters(const std::wstring& _path, const std::wstring& delimiters);
37+
std::vector<std::wstring> DissolveStringBytDelimitersFast(const std::wstring& _strInput, const wchar_t chDelimiterChar);
38+
std::vector<std::wstring> DissolveStringBytDelimiters(const std::wstring& _path, const std::wstring& delimiters);
3939

4040
template <typename Out>
4141
void split(const std::wstring& s, wchar_t delim, Out result);
42-
static std::vector<std::wstring> split(const std::wstring& s, wchar_t delim);
42+
std::vector<std::wstring> split(const std::wstring& s, wchar_t delim);
4343

44-
inline bool CompareNoCase(const std::wstring& str1, const std::wstring& str2);
45-
inline bool CompareExtension(const std::wstring& str1, const std::wstring& str2);
44+
bool CompareNoCase(const std::wstring& str1, const std::wstring& str2);
45+
bool CompareExtension(const std::wstring& str1, const std::wstring& str2);
4646

47-
static std::wstring ToForwardSlash(const std::wstring& _strInput);
48-
static std::wstring ToLowerAndBackSlash(const std::wstring& _strInput);
47+
std::wstring ToForwardSlash(const std::wstring& _strInput);
48+
std::wstring ToLowerAndBackSlash(const std::wstring& _strInput);
4949

5050
std::wstring GetComError(HRESULT hrResult);
5151
std::string GetComErrorNarrow(HRESULT hrResult);

0 commit comments

Comments
 (0)