Changeset 828 in dev for trunk/ab5.0/abdev/abdev/stdafx.h

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/abdev/stdafx.h (modified) (4 diffs)

trunk/ab5.0/abdev/abdev/stdafx.h

@@ -1 +1 @@
 #pragma once
-#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
 
 #include <map>
@@ -26 +25 @@
 #include <atlcom.h>
 #include <atlhost.h>
+#undef _SECURE_ATL
+#define _SECURE_ATL 1
+#pragma warning(push)
+#pragma warning(disable: 6011 6246 6255 6269 6387)
 #include <atlapp.h>
 #include <atlframe.h>
@@ -31 +34 @@
 #include <atlmisc.h>
 #include <atlctrls.h>
+#pragma warning(pop)
 
 //boost libraries
@@ -40 +44 @@
 
 // tinyxml
+#pragma warning(push)
+#pragma warning(disable: 6011)
 #include <tinyxml/tinyxml.h>
+#pragma warning(pop)
 
 #include <jenga/include/jenga.h>