Commit a0f8c9c4 authored by garciay's avatar garciay
Browse files

Rebuild with TCT3

parent b29aa24a

ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc

+4 −4
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ int uppertester_cam_codec::encode (const Record_Type& msg, OCTETSTRING& data) 
  } else if (std::string(msg.get_descriptor()->name).compare("@LibItsCam_TypesAndValues.UtCamChangePosition") == 0) {

    encoding_buffer.put_c(static_cast<const unsigned char>(uppertester_cam_codec::c_utCamChangePosition));

  } else { // Error

    data = OCTETSTRING();

    loggers::get_instance().log("<<< uppertester_cam_codec::encode: Return -1");

    data = OCTETSTRING(0, nullptr);

    loggers::get_instance().warning("<<< uppertester_cam_codec::encode: Failed to encode UT message");

    return -1;

  }

  encode_(msg, *msg.get_descriptor(), encoding_buffer);
@@ -92,8 +92,8 @@ int uppertester_cam_codec::encode (const LibItsCam__TypesAndValues::UtCamTrigger 
    loggers::get_instance().log("uppertester_cam_codec::encode: BarSirene=0x%02x - 0x%02x", *static_cast<const unsigned char*>(u.setLightBarSirene()), *static_cast<const unsigned char*>(u.setLightBarSirene()) << 6);

    encoding_buffer.put_c(*static_cast<const unsigned char*>(u.setLightBarSirene()) << 6);

  } else { // Error

    data = OCTETSTRING();

    loggers::get_instance().log("<<< uppertester_cam_codec::encode: Return -1");

    data = OCTETSTRING(0, nullptr);

    loggers::get_instance().warning("<<< uppertester_cam_codec::encode: Failed to encode UT message");

    return -1;

  }

  //encode_(*type, *type->get_descriptor(), encoding_buffer);

ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc

+2 −2
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ int uppertester_denm_codec::encode (const Record_Type& msg, OCTETSTRING& data) 
  } else if (std::string(msg.get_descriptor()->name).compare("@LibItsDenm_TypesAndValues.UtDenmTermination") == 0) {

    encoding_buffer.put_c(static_cast<unsigned char>(uppertester_denm_codec::c_utDenmTermination));

  } else { // Error

    data = OCTETSTRING();

    loggers::get_instance().log("<<< uppertester_denm_codec::encode: Return -1");

    data = OCTETSTRING(0, nullptr);

    loggers::get_instance().warning("<<< uppertester_denm_codec::encode: Failed to encode UT message");

    return -1;

  }

  encode_(msg, *msg.get_descriptor(), encoding_buffer);

ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.cc

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ int uppertester_geonetworking_codec::encode (const Record_Type& msg, OCTETSTRING 
  } else if (std::string(msg.get_descriptor()->name).compare("@LibItsGeoNetworking_TypesAndValues.UtGnChangePosition") == 0) {

    encoding_buffer.put_c(static_cast<unsigned char>(uppertester_geonetworking_codec::c_utGnChangePosition));

  } else { // Error

    data = OCTETSTRING();

    data = OCTETSTRING(0, nullptr);

    return -1;

  }

  encode_(msg, *msg.get_descriptor(), encoding_buffer);
@@ -58,7 +58,7 @@ int uppertester_geonetworking_codec::encode (const Base_Type& msg, OCTETSTRING& 
      type = (Base_Type*)&(t.tsb());

    } // else, nothing to do

  } else {

    data = OCTETSTRING();

    data = OCTETSTRING(0, nullptr);

    return -1;

  }

  encode_(*type, *(type->get_descriptor()), encoding_buffer);

ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.cc

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ void uppertester_geonetworking_layer::sendMsg(const LibItsGeoNetworking__TypesAn 
  } else {

    // Encode UpperTester PDU

    OCTETSTRING data;

    _codec.encode((const Record_Type&)send_par, data);

    _codec.encode(send_par, data);

    // Update parameters

    send_data(data, p_params);

  }