Skip to content

Commit af79297

Browse files
[MERGE #1404 @digitalinfinity] Fix build break in VS2013
Merge pull request #1404 from digitalinfinity:warning_fix Disable a warning in VS2013 in Utf8Codex.cpp (it's disabled through the rest of the project anyway, but Codex doesn't use the header that disables those warnings so explicitly disable for Utf8Codex too)
2 parents 1d2447b + e9f1475 commit af79297

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

lib/Common/Codex/Utf8Codex.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99
#define _Analysis_assume_(expr)
1010
#endif
1111

12+
#ifdef _MSC_VER
13+
//=============================
14+
// Disabled Warnings
15+
//=============================
16+
17+
#pragma warning(push)
18+
19+
#pragma warning(disable: 4127) // constant expression for template parameter
20+
#endif
21+
1222
extern void CodexAssert(bool condition);
1323

1424
namespace utf8
@@ -611,3 +621,7 @@ namespace utf8
611621
}
612622

613623
} // namespace utf8
624+
625+
#ifdef _MSC_VER
626+
#pragma warning(pop)
627+
#endif

0 commit comments

Comments
 (0)