Commit 3fe62c7e authored by garciay's avatar garciay
Browse files

Rename xxxPositionVector.timstamp field into xxxPositionVector.timstamp_...

Rename xxxPositionVector.timstamp field into xxxPositionVector.timstamp_ because 'timstamp' is a TTCN-3 key word
parent 7ad825ba
......@@ -872,8 +872,8 @@ module LibItsGeoNetworking_Functions {
function @deterministic f_fillTimestamp(inout LongPosVector v_vector)
return LongPosVector {
if (v_vector.timestamp == 0) {
v_vector.timestamp := f_computeGnTimestamp();
if (v_vector.timestamp_ == 0) {
v_vector.timestamp_ := f_computeGnTimestamp();
}
return v_vector;
}
......@@ -897,8 +897,8 @@ module LibItsGeoNetworking_Functions {
}
}
if (isbound(v_return) and (v_return.timestamp == 0)) {
v_return.timestamp := f_computeGnTimestamp();
if (isbound(v_return) and (v_return.timestamp_ == 0)) {
v_return.timestamp_ := f_computeGnTimestamp();
}
return v_return;
}
......@@ -943,7 +943,7 @@ module LibItsGeoNetworking_Functions {
v_return.latitude := v_return.latitude + p_latitudeFactor * v_distanceUnit;
v_return.longitude := v_return.longitude + p_longitudeFactor * v_distanceUnit;
v_return.timestamp := f_computeGnTimestamp();
v_return.timestamp_ := f_computeGnTimestamp();
v_return.pai := int2bit(1,1);
return v_return;
......@@ -2380,7 +2380,7 @@ module LibItsGeoNetworking_Functions {
v_shortPosVector := {
gnAddr := p_longPosVector.gnAddr,
timestamp := p_longPosVector.timestamp,
timestamp_ := p_longPosVector.timestamp_,
latitude := p_longPosVector.latitude,
longitude := p_longPosVector.longitude
};
......
......@@ -1603,7 +1603,7 @@ module LibItsGeoNetworking_Templates {
in template (present) GN_Address p_gnAddress
) := {
gnAddr := p_gnAddress,
timestamp := ?,
timestamp_ := ?,
latitude := ?,
longitude := ?,
pai := ?,
......@@ -1619,7 +1619,7 @@ module LibItsGeoNetworking_Templates {
in template (value) LongPosVector p_longPosVector
) := {
gnAddr := p_longPosVector.gnAddr,
timestamp := ?,
timestamp_ := ?,
latitude := p_longPosVector.latitude,
longitude := p_longPosVector.longitude,
pai := ?,
......@@ -1647,7 +1647,7 @@ module LibItsGeoNetworking_Templates {
in template (value) ShortPosVector p_shortPosVector
) := {
gnAddr := p_shortPosVector.gnAddr,
timestamp := ?,
timestamp_ := ?,
latitude := p_shortPosVector.latitude,
longitude := p_shortPosVector.longitude
}
......@@ -2290,7 +2290,7 @@ module LibItsGeoNetworking_Templates {
*/
template (value) LongPosVector m_dummyLongPosVector := {
gnAddr := m_dummyGnAddr,
timestamp := c_uInt32Zero,
timestamp_ := c_uInt32Zero,
latitude := c_uInt32Zero,
longitude := c_uInt32Zero,
pai := int2bit(1,1),
......
......@@ -719,7 +719,7 @@ module LibItsGeoNetworking_TypesAndValues {
* @see ETSI EN 302 636-4-1 chapter 8.5.2
*
* @member gnAddr
* @member timestamp
* @member timestamp_
* @member latitude
* @member longitude
* @member pai Position Accuracy Indicator
......@@ -728,7 +728,7 @@ module LibItsGeoNetworking_TypesAndValues {
*/
type record LongPosVector {
GN_Address gnAddr,
UInt32 timestamp,
UInt32 timestamp_,
Int32 latitude,
Int32 longitude,
Bit1 pai,
......@@ -762,7 +762,7 @@ module LibItsGeoNetworking_TypesAndValues {
*/
type record ShortPosVector {
GN_Address gnAddr,
UInt32 timestamp,
UInt32 timestamp_,
Int32 latitude,
Int32 longitude
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment