X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fcontainer.hxx;h=560df1c99cbb9073eb7428af64a5128925291d5d;hp=8491926eab9bbd075fd059f9e9894ca67ab00ab2;hb=9e76c81586915f9ff6f413d9fefec9b7be7cad31;hpb=d184c64894e6c4f3adb9467078acfc9e7446664a

diff --git a/src/container.hxx b/src/container.hxx
index 8491926..560df1c 100644
--- a/src/container.hxx
+++ b/src/container.hxx
@@ -19,6 +19,12 @@
 #ifndef __LIBT2N_CONTAINER
 #define __LIBT2N_CONTAINER
 
+#include <boost/archive/binary_oarchive.hpp>
+#include <boost/archive/binary_iarchive.hpp>
+#include <boost/archive/xml_oarchive.hpp>
+#include <boost/archive/xml_iarchive.hpp>
+#include <boost/serialization/serialization.hpp>
+
 #include "command.hxx"
 #include "t2n_exception.hxx"
 
@@ -27,7 +33,7 @@
 namespace libt2n
 {
 
-/** @brief contains the result (return value or exception) of a executed command
+/** @brief contains the result (return value as libt2n::result or an libt2n::t2n_exception) of a executed command
 */
 class result_container
 {
@@ -38,52 +44,48 @@ class result_container
         t2n_exception *ex;
 
         friend class boost::serialization::access;
-        // 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 >>.
         template<class Archive>
-        void serialize(Archive & ar, const unsigned int version)
-        {
-            ar & BOOST_SERIALIZATION_NVP(result_type);
-            ar & BOOST_SERIALIZATION_NVP(res);
-            ar & BOOST_SERIALIZATION_NVP(ex);
-        }
+        void serialize(Archive & ar, const unsigned int version);
 
     public:
         result_container()
-            { res=0; ex=0; }
+            : res(NULL)
+            , ex(NULL)
+            , result_type(regular)
+        {
+        }
 
         result_container(result *_res)
-            { set_result(_res); }
+            : res(_res)
+            , ex(NULL)
+            , result_type(regular)
+        {
+        }
+
         result_container(t2n_exception *_ex)
-            { set_exception(_ex); }
+            : res(NULL)
+            , ex(_ex)
+            , result_type(exception)
+        {
+        }
+
+        ~result_container();
 
         void set_result(result *_res)
             { res=_res; ex=0; result_type=regular; }
+
         void set_exception(t2n_exception *_ex)
             { res=0; ex=_ex; result_type=exception; }
 
-        /** @brief returns the result or throw the carried exception.
-                   ATTENTION: the result object is deleted in the destructor
-        */
-        result* get_result(void)
-        {
-            if (result_type==exception)
-                ex->do_throw();
-            return res;
-        }
+        result* get_result(void);
 
-        /// deletes the carried result or exception objects
-        ~result_container()
-        {
-            if (res)
-                delete res;
-            if (ex)
-                delete ex;
-        }
+        bool has_exception()
+            { return (result_type==exception && ex != NULL); }
+        bool has_result()
+            { return (result_type==regular && res != NULL); }
 };
 
-/** @brief contains a command
+/** @brief contains a libt2n::command
 */
 class command_container
 {
@@ -92,27 +94,22 @@ class command_container
 
         friend class boost::serialization::access;
         template<class Archive>
-        void serialize(Archive & ar, const unsigned int version)
-        {
-            std::cerr << "ser: command_container" << std::endl;
-            ar & BOOST_SERIALIZATION_NVP(cmd);
-        }
+        void serialize(Archive & ar, const unsigned int version);
 
     public:
         command_container()
-            { cmd=0; }
+            : cmd(NULL)
+        {}
+
         command_container(command *_cmd)
-            { cmd=_cmd; }
+            : cmd(_cmd)
+        {}
+
+        ~command_container();
 
         /// return the contained command
         command* get_command()
             { return cmd; }
-
-        ~command_container()
-        {
-            if (cmd)
-                delete cmd;
-        }
 };
 
 } // namespace libt2n
@@ -120,5 +117,7 @@ class command_container
 BOOST_CLASS_TRACKING(libt2n::result_container, boost::serialization::track_never)
 BOOST_CLASS_TRACKING(libt2n::command_container, boost::serialization::track_never)
 
+#include "container.tcc"
+
 #endif