Changeset 83790 in vbox

Timestamp:

Apr 18, 2020 12:37:12 AM (5 years ago)

Author:

vboxsync

Message:

Main: VC++ 14.1 adjustments. bugref:8489

Location:

trunk/include/iprt/sanitized

Files:

• iterator (copied) (copied from trunk/include/iprt/sanitized/string ) (5 diffs)
• sstream (copied) (copied from trunk/include/iprt/sanitized/string ) (5 diffs)

trunk/include/iprt/sanitized/iterator

@@ -1 +1 @@
 /** @file
- * Safe way to include the 'string' header from the C++ library.
+ * Safe way to include the 'iterator' header from the C++ library.
  */
 
@@ -24 +24 @@
  */
 
-#ifndef IPRT_INCLUDED_sanitized_string_h
-#define IPRT_INCLUDED_sanitized_string_h
+#ifndef IPRT_INCLUDED_sanitized_iterator_h
+#define IPRT_INCLUDED_sanitized_iterator_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -32 +32 @@
 #ifdef _MSC_VER
 /*
- * Unfortunately, the 'string' file of VCC141 has trouble with C4091 in -Wall mode:
- *      string(530): warning C4774: '_scprintf' : format string expected in argument 1 is not a string literal
+ * Unfortunately, the 'iterator' file of VCC141 has trouble with C4091 in -Wall mode (via ios):
  *      xlocnum(1616): warning C4774: 'sprintf_s' : format string expected in argument 3 is not a string literal
  */
@@ -42 +41 @@
 #endif
 
-#include <string>
+#include <iterator>
 
 #ifdef _MSC_VER
@@ -48 +47 @@
 #endif
 
-#endif /* !IPRT_INCLUDED_sanitized_string_h */
+#endif /* !IPRT_INCLUDED_sanitized_iterator_h */
 

trunk/include/iprt/sanitized/sstream

@@ -1 +1 @@
 /** @file
- * Safe way to include the 'string' header from the C++ library.
+ * Safe way to include the 'sstream' header from the C++ library.
  */
 
@@ -24 +24 @@
  */
 
-#ifndef IPRT_INCLUDED_sanitized_string_h
-#define IPRT_INCLUDED_sanitized_string_h
+#ifndef IPRT_INCLUDED_sanitized_sstream_h
+#define IPRT_INCLUDED_sanitized_sstream_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -32 +32 @@
 #ifdef _MSC_VER
 /*
- * Unfortunately, the 'string' file of VCC141 has trouble with C4091 in -Wall mode:
- *      string(530): warning C4774: '_scprintf' : format string expected in argument 1 is not a string literal
- *      xlocnum(1616): warning C4774: 'sprintf_s' : format string expected in argument 3 is not a string literal
+ * Unfortunately, the 'sstream' file of VCC141 has trouble with C4091 in -Wall mode
+ * because it drags in string.h which causes stuff like:
+ *      xlocnum(1616): warning C4774: 'sprintf_s' : format sstream expected in argument 3 is not a sstream literal
+ *      sstream(530): warning C4774: '_scprintf' : format sstream expected in argument 1 is not a sstream literal
  */
 # pragma warning(push)
@@ -42 +43 @@
 #endif
 
-#include <string>
+#include <sstream>
 
 #ifdef _MSC_VER
@@ -48 +49 @@
 #endif
 
-#endif /* !IPRT_INCLUDED_sanitized_string_h */
+#endif /* !IPRT_INCLUDED_sanitized_sstream_h */