X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Flibs%2Fserialization%2Ftest%2Ftest_dll_exported.cpp;h=4360b682503449453970907e4b52940fd043df56;hb=b32b81446b3b05102be0267e79203f59329c1d97;hp=03095ab1de8561d12c87fb538a481b4d05d240b0;hpb=215dd7151453fae88e6f968c975b6ce309d42dcf;p=ceph.git

diff --git a/ceph/src/boost/libs/serialization/test/test_dll_exported.cpp b/ceph/src/boost/libs/serialization/test/test_dll_exported.cpp
index 03095ab1d..4360b6825 100644
--- a/ceph/src/boost/libs/serialization/test/test_dll_exported.cpp
+++ b/ceph/src/boost/libs/serialization/test/test_dll_exported.cpp
@@ -45,7 +45,6 @@ namespace std{
 #include <boost/serialization/export.hpp>
 #include <boost/serialization/access.hpp>
 
-#define POLYMORPHIC_BASE_IMPORT
 #include "polymorphic_base.hpp"
 
 class polymorphic_derived1 : public polymorphic_base
@@ -62,12 +61,13 @@ public:
     virtual ~polymorphic_derived1(){}
 };
 
-BOOST_CLASS_EXPORT(polymorphic_derived1)
+BOOST_CLASS_EXPORT_KEY(polymorphic_derived1)
+BOOST_CLASS_EXPORT_IMPLEMENT(polymorphic_derived1)
 
 // MWerks users can do this to make their code work
 BOOST_SERIALIZATION_MWERKS_BASE_AND_DERIVED(polymorphic_base, polymorphic_derived1)
 
-#define POLYMORPHIC_DERIVED_IMPORT
+#define POLYMORPHIC_DERIVED2_IMPORT
 #include "polymorphic_derived2.hpp"
 
 // save exported polymorphic class
@@ -86,8 +86,9 @@ void save_exported(const char *testfile)
     oa << BOOST_SERIALIZATION_NVP(rb2);
     oa << BOOST_SERIALIZATION_NVP(rd21);
 
-    delete rb1;
+    delete rd21;
     delete rb2;
+    delete rb1;
 }
 
 // save exported polymorphic class
@@ -129,9 +130,9 @@ void load_exported(const char *testfile)
             ::type::get_const_instance().get_derived_extended_type_info(*rd21),
         "restored pointer d2 not of correct type"
     );
-    delete rb1;
-    delete rb2;
     delete rd21;
+    delete rb2;
+    delete rb1;
 }
 
 int