Commit 9f2d27be authored by Denis Filatov's avatar Denis Filatov
Browse files

fix codec.hh virtual functions handling for new version of gcc; move per/oer_codecs to ccsrc/asn1c

parent 4b2d4dbd

ccsrc/Asn1c/asn1_recoder.cc

+2 −2
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ int asn1_recoder::per2ber(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf) 


int asn1_recoder::ber2oer(const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf)

{

  return recode(td, (int)ATS_XER, (int)ATS_CANONICAL_OER, buf);

  return recode(td, (int)ATS_BER, (int)ATS_CANONICAL_OER, buf);

}



int asn1_recoder::oer2ber(const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf)

{

  return recodeOer(td, (int)ATS_BASIC_OER, (int)ATS_XER, buf);

  return recode(td, (int)ATS_BASIC_OER, (int)ATS_BER, buf);

}

ccsrc/Asn1c/per_codec.hh

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ public: //! \publicsection 
  virtual int decode(const BITSTRING& p_bitstring, TPDU& p_message) = 0;

  

protected: //! \protectedsection

  int _decode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const BITSTRING& p_data, TPDU& msg);

  int _encode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const TPDU& msg, BITSTRING& p_data);

  inline int _decode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const BITSTRING& p_data, TPDU& msg);

  inline int _encode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const TPDU& msg, BITSTRING& p_data);

}; // End of class per_codec



#include <TTCN3.hh>

ccsrc/Protocols/CAM/cam_codec.hh

+5 −4
Original line number Diff line number Diff line
@@ -2,14 +2,15 @@ 


#include "cam_pdu_codec.hh"

#include "codec.hh"

#include "params_its.hh"



class BITSTRING;   //! Forward declaration of TITAN class

class OCTETSTRING; //! Forward declaration of TITAN class

class params_its;



namespace CAM__PDU__Descriptions { //! Forward declaration of asn1c CAM class

  class CAM;

}

//namespace CAM__PDU__Descriptions { //! Forward declaration of asn1c CAM class

//  class CAM;

//}

#include "LibItsCam_TypesAndValues.hh"



class cam_codec : public codec<CAM__PDU__Descriptions::CAM, CAM__PDU__Descriptions::CAM> {

  cam_pdu_codec asn_codec;

ccsrc/Protocols/DENM/denm_codec.hh

+1 −1
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


#include "codec.hh"

#include "denm_pdu_codec.hh"

#include "params_its.hh"



class BITSTRING;

class OCTETSTRING;

class Base_Type;

class TTCN_Typedescriptor_t;

class TTCN_Buffer;

class params_its;



namespace DENM__PDU__Descriptions {

  class DENM;

ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include "geonetworking_codec.hh"

#include "loggers.hh"

#include "params_its.hh"



#include "etsi_ts103097_data_codec.hh"