X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fcontainer.hxx;h=5aa63541f791e9fd73da78cd5237386882d890e0;hp=8491926eab9bbd075fd059f9e9894ca67ab00ab2;hb=44b4600fd51677e54dd167734ca9252b58237cda;hpb=d184c64894e6c4f3adb9467078acfc9e7446664a diff --git a/src/container.hxx b/src/container.hxx index 8491926..5aa6354 100644 --- a/src/container.hxx +++ b/src/container.hxx @@ -1,24 +1,33 @@ -/*************************************************************************** - * Copyright (C) 2006 by Gerd v. Egidy * - * gve@intra2net.com * - * * - * This library is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Lesser General Public License version * - * 2.1 as published by the Free Software Foundation. * - * * - * This library is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/* +Copyright (C) 2006 by Intra2net AG - Gerd v. Egidy + +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ #ifndef __LIBT2N_CONTAINER #define __LIBT2N_CONTAINER +#include +#include +#include +#include +#include + #include "command.hxx" #include "t2n_exception.hxx" @@ -27,63 +36,59 @@ 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 { private: - enum result_type_t { regular, exception } result_type; - result *res; t2n_exception *ex; + enum result_type_t { regular, exception } result_type; + 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 - 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 +97,22 @@ class command_container friend class boost::serialization::access; template - 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 +120,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