Forráskód Böngészése

COMP: Need to choose between <new> and <new.h> based on whether standard headers are available.

Brad King 21 éve
szülő
commit
920df088ab
1 módosított fájl, 6 hozzáadás és 1 törlés
  1. 6 1
      Source/kwsys/kwsys_ios_sstream.h.in

+ 6 - 1
Source/kwsys/kwsys_ios_sstream.h.in

@@ -34,6 +34,7 @@
 # ifdef _MSC_VER
 #  pragma warning (push, 1)
 #  pragma warning (disable: 4702)
+#  pragma warning (disable: 4995) /* Old streams are deprecated.  */
 # endif
 # if @KWSYS_NAMESPACE@_IOS_USE_ANSI
 #  include <strstream>
@@ -42,6 +43,11 @@
 # elif @KWSYS_NAMESPACE@_IOS_USE_STRSTREA_H
 #  include <strstrea.h>
 # endif
+# if @KWSYS_NAMESPACE@_IOS_USE_ANSI
+#  include <new> // Need placement operator new.
+# else
+#  include <new.h> // Need placement operator new.
+# endif
 # ifdef _MSC_VER
 #  pragma warning(pop)
 # endif
@@ -50,7 +56,6 @@
 // ostringstream and istringstream classes.
 
 # include <@KWSYS_NAMESPACE@/stl/string>
-# include <new> // Need placement operator new.
 
 namespace @KWSYS_NAMESPACE@_ios
 {