diff --git a/lib/Common/Codex/Utf8Codex.cpp b/lib/Common/Codex/Utf8Codex.cpp
index 7880a51fd70..3d37899e262 100644
--- a/lib/Common/Codex/Utf8Codex.cpp
+++ b/lib/Common/Codex/Utf8Codex.cpp
@@ -9,6 +9,16 @@
 #define _Analysis_assume_(expr)
 #endif
 
+#ifdef _MSC_VER
+//=============================
+// Disabled Warnings
+//=============================
+
+#pragma warning(push)
+
+#pragma warning(disable: 4127)  // constant expression for template parameter
+#endif
+
 extern void CodexAssert(bool condition);
 
 namespace utf8
@@ -611,3 +621,7 @@ namespace utf8
     }
 
 } // namespace utf8
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif