Commit 32594b68 authored by YannGarcia's avatar YannGarcia
Browse files

Reorganize code due to new floag compiler -H in last version of TITAN. No backward compatibility

parent 290d8685

ccsrc/EncDec/LibItsCam_Encdec.cc

+21 −21
Original line number Diff line number Diff line
@@ -163,27 +163,27 @@ namespace LibItsCam__EncdecDeclarations { 
    return 0;

  }



  // BITSTRING fx__enc__CAM(const CAM__PDU__Descriptions::CAM &p_cam) {

  //   loggers::get_instance().log_msg(">>> fx__enc__CAM: ", p_cam);



  //   cam_codec   codec;

  //   OCTETSTRING os;

  //   codec.encode(p_cam, os);

  //   return oct2bit(os);

  // }



  // INTEGER fx__dec__CAM(BITSTRING &b, CAM__PDU__Descriptions::CAM &p) {

  //   loggers::get_instance().log(">>> fx__dec__CAM");

  //   cam_codec   codec;

  //   OCTETSTRING is = bit2oct(b);



  //   if (codec.decode(OCTETSTRING(is.lengthof(), static_cast<const unsigned char *>(is)), p) == -1) {

  //     loggers::get_instance().warning("fx__dec__CAM: -1 result code was returned");

  //     return -1;

  //   }



  //   return 0;

  // }

  BITSTRING fx__enc__CAM(const CAM__PDU__Descriptions::CAM &p_cam) {

    loggers::get_instance().log_msg(">>> fx__enc__CAM: ", p_cam);



    cam_codec   codec;

    OCTETSTRING os;

    codec.encode(p_cam, os);

    return oct2bit(os);

  }



  INTEGER fx__dec__CAM(BITSTRING &b, CAM__PDU__Descriptions::CAM &p) {

    loggers::get_instance().log(">>> fx__dec__CAM");

    cam_codec   codec;

    OCTETSTRING is = bit2oct(b);



    if (codec.decode(OCTETSTRING(is.lengthof(), static_cast<const unsigned char *>(is)), p) == -1) {

      loggers::get_instance().warning("fx__dec__CAM: -1 result code was returned");

      return -1;

    }



    return 0;

  }



  BITSTRING fx__enc__UtCamInitialize(const LibItsCam__TypesAndValues::UtCamInitialize &p_utCamInitialize) {

    loggers::get_instance().log_msg(">>> fx__enc__UtCamInitialize: ", p_utCamInitialize);

ccsrc/EncDec/LibItsDenm_Encdec.cc

+22 −0
Original line number Diff line number Diff line
@@ -162,6 +162,28 @@ namespace LibItsDenm__EncdecDeclarations { 
    return 0;

  }



  BITSTRING fx__enc__DENM(const DENM__PDU__Descriptions::DENM &p_denm) {

    loggers::get_instance().log_msg(">>> fx__enc__DENM: ", p_denm);



    denm_codec  codec;

    OCTETSTRING os;

    codec.encode(p_denm, os);

    return oct2bit(os);

  }



  INTEGER fx__dec__DENM(BITSTRING &b, DENM__PDU__Descriptions::DENM &p) {

    loggers::get_instance().log(">>> fx__dec__DENM");

    denm_codec  codec;

    OCTETSTRING is = bit2oct(b);



    if (codec.decode(OCTETSTRING(is.lengthof(), static_cast<const unsigned char *>(is)), p) == -1) {

      loggers::get_instance().warning("fx__dec__DENM: -1 result code was returned");

      return -1;

    }



    return 0;

  }



  BITSTRING fx__enc__UtDenmInitialize(const LibItsDenm__TypesAndValues::UtDenmInitialize &p_utDenmInitialize) {

    loggers::get_instance().log_msg(">>> fx__enc__UtDenmInitialize: ", p_utDenmInitialize);

ccsrc/EncDec/LibItsIvim_Encdec.cc

+22 −0
Original line number Diff line number Diff line
@@ -163,6 +163,28 @@ namespace LibItsIvim__EncdecDeclarations { 
    return 0;

  }



  BITSTRING fx__enc__IVIM(const IVIM__PDU__Descriptions::IVIM &p_ivim) {

    loggers::get_instance().log_msg(">>> fx__enc__IVIM: ", p_ivim);



    ivim_codec  codec;

    OCTETSTRING os;

    codec.encode(p_ivim, os);

    return oct2bit(os);

  }



  INTEGER fx__dec__IVIM(BITSTRING &b, IVIM__PDU__Descriptions::IVIM &p) {

    loggers::get_instance().log(">>> fx__dec__IVIM");

    ivim_codec  codec;

    OCTETSTRING is = bit2oct(b);



    if (codec.decode(OCTETSTRING(is.lengthof(), static_cast<const unsigned char *>(is)), p) == -1) {

      loggers::get_instance().warning("fx__dec__IVIM: -1 result code was returned");

      return -1;

    }



    return 0;

  }



  BITSTRING fx__enc__UtIvimInitialize(const LibItsIvim__TypesAndValues::UtIvimInitialize &p_utIvimInitialize) {

    loggers::get_instance().log_msg(">>> fx__enc__UtIvimInitialize: ", p_utIvimInitialize);

ccsrc/EncDec/LibItsMapemSpatem_Encdec.cc

+45 −0
Original line number Diff line number Diff line
@@ -164,6 +164,28 @@ namespace LibItsMapemSpatem__EncdecDeclarations { 
    return 0;

  }



  BITSTRING fx__enc__MAPEM(const MAPEM__PDU__Descriptions::MAPEM &p_mapem) {

    loggers::get_instance().log_msg(">>> fx__enc__Mapem: ", p_mapem);



    mapem_codec codec;

    OCTETSTRING os;

    codec.encode(p_mapem, os);

    return oct2bit(os);

  }



  INTEGER fx__dec__MAPEM(BITSTRING &b, MAPEM__PDU__Descriptions::MAPEM &p) {

    loggers::get_instance().log(">>> fx__dec__Mapem");

    mapem_codec codec;

    OCTETSTRING is = bit2oct(b);



    if (codec.decode(OCTETSTRING(is.lengthof(), static_cast<const unsigned char *>(is)), p) == -1) {

      loggers::get_instance().warning("fx__dec__Mapem: -1 result code was returned");

      return -1;

    }



    return 0;

  }



  /****************************************************

   * @desc    External function to encode a SpatemReq type

   * @param   value to encode
@@ -320,6 +342,29 @@ namespace LibItsMapemSpatem__EncdecDeclarations { 
    return 0;

  }



  BITSTRING fx__enc__SPATEM(const SPATEM__PDU__Descriptions::SPATEM &p_spatem) {

    loggers::get_instance().log_msg(">>> fx__enc__Spatem: ", p_spatem);



    spatem_codec codec;

    OCTETSTRING  os;

    codec.encode(p_spatem, os);

    return oct2bit(os);

  }



  INTEGER fx__dec__SPATEM(BITSTRING &b, SPATEM__PDU__Descriptions::SPATEM &p_spatem) {

    loggers::get_instance().log(">>> fx__dec__Spatem");



    spatem_codec codec;

    OCTETSTRING  is = bit2oct(b);



    if (codec.decode(OCTETSTRING(is.lengthof(), static_cast<const unsigned char *>(is)), p_spatem) == -1) {

      loggers::get_instance().warning("fx__dec__Spatem: -1 result code was returned");

      return -1;

    }



    return 0;

  }



  BITSTRING fx__enc__UtMapemSpatemInitialize(const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemInitialize &p_utMapemSpatemInitialize) {

    loggers::get_instance().log_msg(">>> fx__enc__UtMapemSpatemInitialize: ", p_utMapemSpatemInitialize);

ccsrc/EncDec/LibItsMbr_Encdec.cc

+25 −25
Original line number Diff line number Diff line 
// #include "LibItsMbr_EncdecDeclarations.hh"

#include "LibItsMbr_EncdecDeclarations.hh"



// #include "etsi_ts103759_data_codec.hh"

#include "etsi_ts103759_data_codec.hh"



// #include "loggers.hh"

#include "loggers.hh"



// namespace LibItsMbr__EncdecDeclarations {

namespace LibItsMbr__EncdecDeclarations {



//   BITSTRING fx__enc__EtsiTs103759Data(const EtsiTs103759Core::EtsiTs103759Data &p_etsi_ts_103759_data) {

//     loggers::get_instance().log_msg(">>> fx__enc__EtsiTs103759Data: ", p_etsi_ts_103759_data);

  BITSTRING fx__enc__EtsiTs103759Data(const EtsiTs103759Core::EtsiTs103759Data &p_etsi_ts_103759_data) {

    loggers::get_instance().log_msg(">>> fx__enc__EtsiTs103759Data: ", p_etsi_ts_103759_data);



//     etsi_ts103759_data_codec codec;

//     OCTETSTRING              os;

//     if (codec.encode(p_etsi_ts_103759_data, os) == -1) {

//       loggers::get_instance().warning("fx__enc__EtsiTs103759Data: -1 result code was returned");

//       return int2bit(0, 1);

//     }

    etsi_ts103759_data_codec codec;

    OCTETSTRING              os;

    if (codec.encode(p_etsi_ts_103759_data, os) == -1) {

      loggers::get_instance().warning("fx__enc__EtsiTs103759Data: -1 result code was returned");

      return int2bit(0, 1);

    }



//     return oct2bit(os);

//   }

    return oct2bit(os);

  }



//   INTEGER fx__dec__EtsiTs103759Data(BITSTRING &b, EtsiTs103759Core::EtsiTs103759Data &p_etsi_ts_103759_data) {

//     loggers::get_instance().log_msg(">>> fx__dec__EtsiTs103759Data: ", b);

  INTEGER fx__dec__EtsiTs103759Data(BITSTRING &b, EtsiTs103759Core::EtsiTs103759Data &p_etsi_ts_103759_data) {

    loggers::get_instance().log_msg(">>> fx__dec__EtsiTs103759Data: ", b);



//     etsi_ts103759_data_codec codec;

//     OCTETSTRING              is = bit2oct(b);

//     if (codec.decode(is, p_etsi_ts_103759_data) == -1) {

//       loggers::get_instance().warning("fx__dec__EtsiTs103759Data: -1 result code was returned");

//       return -1;

//     }

    etsi_ts103759_data_codec codec;

    OCTETSTRING              is = bit2oct(b);

    if (codec.decode(is, p_etsi_ts_103759_data) == -1) {

      loggers::get_instance().warning("fx__dec__EtsiTs103759Data: -1 result code was returned");

      return -1;

    }



//     return 0;

//   }

    return 0;

  }





// } // End of namespace LibItsMbr__EncdecDeclarations
 
} // End of namespace LibItsMbr__EncdecDeclarations