ack (code review only)
On 07/08/15 16:57, Hans Nordeback wrote:
> osaf/services/saf/amf/amfd/compcstype.cc | 23 ++---------------------
> osaf/services/saf/amf/amfd/include/comp.h | 15 +++++++--------
> 2 files changed, 9 insertions(+), 29 deletions(-)
>
>
> Use C++11 in-class initializers.
>
> diff --git a/osaf/services/saf/amf/amfd/compcstype.cc
> b/osaf/services/saf/amf/amfd/compcstype.cc
> --- a/osaf/services/saf/amf/amfd/compcstype.cc
> +++ b/osaf/services/saf/amf/amfd/compcstype.cc
> @@ -43,34 +43,15 @@ static char *StrDup(const char *s)
> }
>
> //
> -AVD_COMPCS_TYPE::AVD_COMPCS_TYPE()
> -: saAmfCompNumMaxActiveCSIs(0), saAmfCompNumMaxStandbyCSIs(0),
> - saAmfCompNumCurrActiveCSIs(0), saAmfCompNumCurrStandbyCSIs(0),
> - comp(0)
> -{
> - saAmfCompAssignedCsi = new std::vector<SaNameT>;
> -
> - memset(&name, '\0', sizeof(SaNameT));
> +AVD_COMPCS_TYPE::AVD_COMPCS_TYPE() {
> }
>
> //
> -AVD_COMPCS_TYPE::AVD_COMPCS_TYPE(const SaNameT *dn)
> -: saAmfCompNumMaxActiveCSIs(0), saAmfCompNumMaxStandbyCSIs(0),
> - saAmfCompNumCurrActiveCSIs(0), saAmfCompNumCurrStandbyCSIs(0),
> - comp(0)
> -{
> - saAmfCompAssignedCsi = new std::vector<SaNameT>;
> -
> +AVD_COMPCS_TYPE::AVD_COMPCS_TYPE(const SaNameT *dn) {
> memcpy(name.value, dn->value, dn->length);
> name.length = dn->length;
> }
>
> -//
> -AVD_COMPCS_TYPE::~AVD_COMPCS_TYPE()
> -{
> - delete saAmfCompAssignedCsi;
> -}
> -
> void avd_compcstype_db_add(AVD_COMPCS_TYPE *cst)
> {
> unsigned int rc;
> diff --git a/osaf/services/saf/amf/amfd/include/comp.h
> b/osaf/services/saf/amf/amfd/include/comp.h
> --- a/osaf/services/saf/amf/amfd/include/comp.h
> +++ b/osaf/services/saf/amf/amfd/include/comp.h
> @@ -157,17 +157,16 @@ extern AmfDb<std::string, AVD_COMP_TYPE
> class AVD_COMPCS_TYPE {
> public:
> AVD_COMPCS_TYPE();
> - ~AVD_COMPCS_TYPE();
>
> explicit AVD_COMPCS_TYPE(const SaNameT *dn);
>
> - SaNameT name;
> - SaUint32T saAmfCompNumMaxActiveCSIs;
> - SaUint32T saAmfCompNumMaxStandbyCSIs;
> - SaUint32T saAmfCompNumCurrActiveCSIs;
> - SaUint32T saAmfCompNumCurrStandbyCSIs;
> - std::vector<SaNameT> *saAmfCompAssignedCsi;
> - AVD_COMP *comp;
> + SaNameT name {};
> + SaUint32T saAmfCompNumMaxActiveCSIs {};
> + SaUint32T saAmfCompNumMaxStandbyCSIs {};
> + SaUint32T saAmfCompNumCurrActiveCSIs {};
> + SaUint32T saAmfCompNumCurrStandbyCSIs {};
> + std::vector<SaNameT> saAmfCompAssignedCsi {};
> + AVD_COMP *comp {};
> private:
> // disallow copy and assign
> AVD_COMPCS_TYPE(const AVD_COMPCS_TYPE&);
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
