Changeset 828 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/ObjectModule.cpp

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/ab_common/src/Lexical/ObjectModule.cpp (modified) (4 diffs)

trunk/ab5.0/abdev/ab_common/src/Lexical/ObjectModule.cpp

@@ -1 @@
-#pragma warning(disable : 4996)
+//#pragma warning(disable : 4996)
 
 #include <map>
@@ -29 +29 @@
 
 
+#pragma warning(push)
+#pragma warning(disable: 4244 6011 6326)
 #ifdef OBJECT_MODULE_IS_NOT_BINARY
 #include <boost/archive/xml_oarchive.hpp>
@@ -42 +44 @@
 #include <boost/serialization/map.hpp>
 #include <boost/serialization/version.hpp>
-#include <boost/serialization/is_abstract.hpp>
 #include <boost/serialization/serialization.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/export.hpp>
+#pragma warning(pop)
 
 #define foreach(v, c) for each (v in c)
@@ -252 +254 @@
     return isSuccessful;
 }
+
+BOOST_CLASS_EXPORT_IMPLEMENT( DynamicMethod );
+BOOST_CLASS_EXPORT_IMPLEMENT( StaticMethod );