fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-28 02:30:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Few manual style fixes for tests

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-25 22:33:12 +04:00
parent d967eaf94d
commit 57de608bf0
6 changed files with 83 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/marshal/array.cpp
+29 -10
View File
@@ -31,7 +31,11 @@ struct CustomType
typename uavcan::StorageType<B>::Type b;
typename uavcan::StorageType<C>::Type c;
CustomType() : a(), b(), c() { }
CustomType()
: a()
, b()
, c()
{ }
bool operator==(const CustomType& rhs) const { return a == rhs.a && b == rhs.b && c == rhs.c; }
@@ -39,19 +43,21 @@ struct CustomType
uavcan::TailArrayOptimizationMode tao_mode = uavcan::TailArrayOptEnabled)
{
int res = 0;
res = A::encode(obj.a, codec, uavcan::TailArrayOptDisabled);
if (res <= 0)
{
return res;
}
res = B::encode(obj.b, codec, uavcan::TailArrayOptDisabled);
if (res <= 0)
{
return res;
}
res = C::encode(obj.c, codec, tao_mode);
if (res <= 0)
{
return res;
}
return 1;
}
@@ -59,19 +65,21 @@ struct CustomType
uavcan::TailArrayOptimizationMode tao_mode = uavcan::TailArrayOptEnabled)
{
int res = 0;
res = A::decode(obj.a, codec, uavcan::TailArrayOptDisabled);
if (res <= 0)
{
return res;
}
res = B::decode(obj.b, codec, uavcan::TailArrayOptDisabled);
if (res <= 0)
{
return res;
}
res = C::decode(obj.c, codec, tao_mode);
if (res <= 0)
{
return res;
}
return 1;
}
};
@@ -356,7 +364,10 @@ struct CustomType2
typename uavcan::StorageType<A>::Type a;
typename uavcan::StorageType<B>::Type b;
CustomType2() : a(), b() { }
CustomType2()
: a()
, b()
{ }
bool operator==(const CustomType2& rhs) const { return a == rhs.a && b == rhs.b; }
@@ -366,10 +377,14 @@ struct CustomType2
int res = 0;
res = A::encode(obj.a, codec, uavcan::TailArrayOptDisabled);
if (res <= 0)
{
return res;
}
res = B::encode(obj.b, codec, tao_mode);
if (res <= 0)
{
return res;
}
return 1;
}
@@ -379,10 +394,14 @@ struct CustomType2
int res = 0;
res = A::decode(obj.a, codec, uavcan::TailArrayOptDisabled);
if (res <= 0)
{
return res;
}
res = B::decode(obj.b, codec, tao_mode);
if (res <= 0)
{
return res;
}
return 1;
}
};