Changeset 83730 in vbox for trunk/include/iprt

Timestamp:

Apr 17, 2020 2:01:53 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137248

Message:

iprt/bldprog-strtab-template.cpp.h: VC++ 14.1 build fixes. bugref:8489

File:

• trunk/include/iprt/bldprog-strtab-template.cpp.h (modified) (2 diffs)

trunk/include/iprt/bldprog-strtab-template.cpp.h

@@ -77 +77 @@
 # include <algorithm>
 # include <map>
-# include <string>
+# if RT_MSC_PREREQ(RT_MSC_VER_VC141)
+#  pragma warning(push)
+#  pragma warning(disable:4774) /* string(530): warning C4774: '_scprintf' : format string expected in argument 1 is not a string literal */
+#  include <string>
+#  pragma warning(pop)
+# else
+#  include <string>
+# endif
 # include <vector>
 
@@ -968 +975 @@
         {
             /* Comment with a uncompressed and more readable version of the string. */
-            fprintf(pOut, off == pCur->offStrTab ? "/* 0x%05x = \"" : "/* 0X%05x = \"", off);
+            if (off == pCur->offStrTab)
+                fprintf(pOut, "/* 0x%05x = \"", off);
+            else
+                fprintf(pOut, "/* 0X%05x = \"", off);
             BldProgStrTab_PrintCStringLitteral(pThis, pCur, pOut);
             fputs("\" */\n", pOut);