ack (code review only). I like this version better than the original, as
it's less error prone. One very minor comment below.
On 07/08/15 16:57, Hans Nordeback wrote:
> osaf/services/saf/amf/amfd/apptype.cc | 16 ++++++----------
> osaf/services/saf/amf/amfd/include/apptype.h | 6 +++---
> 2 files changed, 9 insertions(+), 13 deletions(-)
>
>
> Use C++11 in-class initializers.
>
> diff --git a/osaf/services/saf/amf/amfd/apptype.cc
> b/osaf/services/saf/amf/amfd/apptype.cc
> --- a/osaf/services/saf/amf/amfd/apptype.cc
> +++ b/osaf/services/saf/amf/amfd/apptype.cc
> @@ -26,20 +26,16 @@
>
> AmfDb<std::string, AVD_APP_TYPE> *app_type_db = 0;
>
> -AVD_APP_TYPE::AVD_APP_TYPE(const SaNameT* dn)
> -{
> - sgAmfApptSGTypes = new std::vector<SaNameT>;
> - memset(&name, 0, sizeof(SaNameT));
> +//
Are the // needed?
> +AVD_APP_TYPE::AVD_APP_TYPE(const SaNameT* dn) {
> memcpy(name.value, dn->value, dn->length);
> name.length = dn->length;
> }
>
> -AVD_APP_TYPE::~AVD_APP_TYPE()
> -{
> - delete sgAmfApptSGTypes;
> +//
As above.
> +AVD_APP_TYPE::~AVD_APP_TYPE() {
> }
>
> -
> AVD_APP_TYPE *avd_apptype_get(const SaNameT *dn)
> {
> return app_type_db->find(Amf::to_string(dn));
> @@ -49,7 +45,7 @@ static void apptype_delete(AVD_APP_TYPE
> {
> app_type_db->erase(Amf::to_string(&(*apptype)->name));
>
> - (*apptype)->sgAmfApptSGTypes->clear();
> + (*apptype)->sgAmfApptSGTypes.clear();
> delete *apptype;
> *apptype = NULL;
> }
> @@ -132,7 +128,7 @@ static AVD_APP_TYPE *apptype_create(SaNa
> osafassert(attr->attrValuesNumber > 0);
>
> for (j = 0; j < attr->attrValuesNumber; j++) {
> - app_type->sgAmfApptSGTypes->push_back(*((SaNameT
> *)attr->attrValues[j]));
> + app_type->sgAmfApptSGTypes.push_back(*((SaNameT
> *)attr->attrValues[j]));
> }
>
> rc = 0;
> diff --git a/osaf/services/saf/amf/amfd/include/apptype.h
> b/osaf/services/saf/amf/amfd/include/apptype.h
> --- a/osaf/services/saf/amf/amfd/include/apptype.h
> +++ b/osaf/services/saf/amf/amfd/include/apptype.h
> @@ -37,9 +37,9 @@ class AVD_APP_TYPE {
> public:
> explicit AVD_APP_TYPE(const SaNameT* dn);
> ~AVD_APP_TYPE();
> - SaNameT name;
> - std::vector<SaNameT> *sgAmfApptSGTypes;
> - AVD_APP *list_of_app;
> + SaNameT name {};
> + std::vector<SaNameT> sgAmfApptSGTypes {};
> + AVD_APP *list_of_app {};
> private:
> AVD_APP_TYPE();
> // disallow copy and assign
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
