Commit 44a8a880 authored by Yann Garcia's avatar Yann Garcia
Browse files

Resolve merge conflicts

parent fda63c59

ccsrc/EncDec/LibItsCps_Encdec.cc

+0 −5
Original line number Original line Diff line number Diff line
@@ -195,13 +195,8 @@ namespace LibItsCps__EncdecDeclarations { 
    return 0;

    return 0;

  }

  }





<<<<<<< HEAD

  BITSTRING fx__enc__UtCpmInitialize(const LibItsCps__TypesAndValues::UtCpmInitialize &p_utCpsInitialize) {

    loggers::get_instance().log_msg(">>> fx__enc__UtCpmInitialize: ", p_utCpsInitialize);

=======

  BITSTRING fx__enc__UtCpmInitialize(const LibItsCps__TypesAndValues::UtCpmInitialize &p_utCpmInitialize) {

  BITSTRING fx__enc__UtCpmInitialize(const LibItsCps__TypesAndValues::UtCpmInitialize &p_utCpmInitialize) {

    loggers::get_instance().log_msg(">>> fx__enc__UtCpmInitialize: ", p_utCpmInitialize);

    loggers::get_instance().log_msg(">>> fx__enc__UtCpmInitialize: ", p_utCpmInitialize);

>>>>>>> a676b01 (Bug fixed in ccsrc/Ports/LibIts_ports/UpperTesterPort.hh)





    uppertester_cps_codec codec;

    uppertester_cps_codec codec;

    OCTETSTRING           os;

    OCTETSTRING           os;

ccsrc/Protocols/UpperTester/uppertester_cps_layer.cc

+0 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ uppertester_cps_layer::uppertester_cps_layer(const std::string &p_type, const st 
  }

  }

}

}





void uppertester_cps_layer::sendMsg(const LibItsCps__TypesAndValues::UtCpmInitialize &send_par, params_its &p_params) {

void uppertester_cps_layer::sendMsg(const LibItsCps__TypesAndValues::UtCpmInitialize &send_par, params_its &p_params) {

void uppertester_cps_layer::sendMsg(const LibItsCps__TypesAndValues::UtCpmInitialize &send_par, params_its &p_params) {

  loggers::get_instance().log_msg(">>> uppertester_cps_layer::sendMsg", send_par);

  loggers::get_instance().log_msg(">>> uppertester_cps_layer::sendMsg", send_par);

ccsrc/Protocols/UpperTester/uppertester_vru_codec.cc

+0 −4
Original line number Original line Diff line number Diff line
@@ -11,9 +11,6 @@ 
template <typename T_type> class OPTIONAL;

template <typename T_type> class OPTIONAL;

class TTCN_EncDec;

class TTCN_EncDec;





unsigned char uppertester_vru_codec::c_utVamInitialize              = 0x00;

unsigned char uppertester_vru_codec::c_utVamInitializeResult        = 0x01;

unsigned char uppertester_vru_codec::c_utVamEventInd                = 0x23;

unsigned char uppertester_vru_codec::c_utVamInitialize              = 0x00;

unsigned char uppertester_vru_codec::c_utVamInitialize              = 0x00;

unsigned char uppertester_vru_codec::c_utVamInitializeResult        = 0x01;

unsigned char uppertester_vru_codec::c_utVamInitializeResult        = 0x01;

unsigned char uppertester_vru_codec::c_utVamEventInd                = 0x23;

unsigned char uppertester_vru_codec::c_utVamEventInd                = 0x23;
@@ -153,7 +150,6 @@ std::unique_ptr<Base_Type> uppertester_vru_codec::decode(const OCTETSTRING &data 
  return result;

  return result;

}

}





int uppertester_vru_codec::decode(const OCTETSTRING &data, LibItsVru__TypesAndValues::UtVamResults &msg, params_its *params) {

int uppertester_vru_codec::decode(const OCTETSTRING &data, LibItsVru__TypesAndValues::UtVamResults &msg, params_its *params) {

int uppertester_vru_codec::decode(const OCTETSTRING &data, LibItsVru__TypesAndValues::UtVamResults &msg, params_its *params) {

  loggers::get_instance().log_to_hexa(">>> uppertester_vru_codec::decode: decoding_buffer=", data);

  loggers::get_instance().log_to_hexa(">>> uppertester_vru_codec::decode: decoding_buffer=", data);

ccsrc/Protocols/UpperTester/uppertester_vru_layer.cc

+0 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ uppertester_vru_layer::uppertester_vru_layer(const std::string &p_type, const st 
  }

  }

}

}





void uppertester_vru_layer::sendMsg(const LibItsVru__TypesAndValues::UtVamInitialize &send_par, params_its &p_params) {

void uppertester_vru_layer::sendMsg(const LibItsVru__TypesAndValues::UtVamInitialize &send_par, params_its &p_params) {

void uppertester_vru_layer::sendMsg(const LibItsVru__TypesAndValues::UtVamInitialize &send_par, params_its &p_params) {

  loggers::get_instance().log_msg(">>> uppertester_vru_layer::sendMsg", send_par);

  loggers::get_instance().log_msg(">>> uppertester_vru_layer::sendMsg", send_par);

virtualization/docker-dev/run.sh

+1 −1
Original line number Original line Diff line number Diff line 
#!/bin/bash

#!/bin/bash

# Copyright ETSI 2018-2020

# Copyright ETSI 2018-2024

# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt

# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt





#set -e

#set -e