X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fcontainer.cpp;h=0401af8cc265ce7a6663cc7bb39a41d78fc674b0;hp=a3c9f31f2e6bb053f481ce3e22e27a6640ccdb9b;hb=c72238fb7fc6eb081c2a0bc95fff369c760343f4;hpb=2f90dcbf75fbafbefde8916c6012f0023a90b527 diff --git a/src/container.cpp b/src/container.cpp index a3c9f31..0401af8 100644 --- a/src/container.cpp +++ b/src/container.cpp @@ -32,17 +32,6 @@ BOOST_CLASS_EXPORT(libt2n::command_container) namespace libt2n { -template -void result_container::serialize(Archive & ar, const unsigned int /* version */) -{ - // When the class Archive corresponds to an output archive, the - // & operator is defined similar to <<. Likewise, when the class Archive - // is a type of input archive the & operator is defined similar to >>. - - ar & BOOST_SERIALIZATION_NVP(result_type); - ar & BOOST_SERIALIZATION_NVP(res); - ar & BOOST_SERIALIZATION_NVP(ex); -} /// deletes the carried result or exception objects result_container::~result_container() @@ -51,6 +40,9 @@ result_container::~result_container() delete res; if (ex) delete ex; + + res = NULL; + ex = NULL; } /** @brief returns the result or throw the carried exception. @@ -60,13 +52,8 @@ result* result_container::get_result(void) { if (result_type==exception) ex->do_throw(); - return res; -} -template -void command_container::serialize(Archive & ar, const unsigned int /* version */) -{ - ar & BOOST_SERIALIZATION_NVP(cmd); + return res; } /// deletes the carried command @@ -74,6 +61,8 @@ command_container::~command_container() { if (cmd) delete cmd; + + cmd = NULL; } } // namespace libt2n