fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-16 05:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename ch to chr to avoid shadow variable in ChibiOS

Browse Source
This commit is contained in:
Tom Pittenger
2018-03-25 15:22:53 -07:00
parent 1dfcaca3e0
commit f935822406
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/marshal/array.hpp
+11 -11
View File
@@ -809,13 +809,13 @@ public:
* This operator can only be used with string-like arrays; otherwise it will fail to compile.
* @ref c_str()
*/
bool operator==(const char* ch) const
bool operator==(const char* chr) const
{
if (ch == UAVCAN_NULLPTR)
if (chr == UAVCAN_NULLPTR)
{
return false;
}
return std::strncmp(Base::c_str(), ch, MaxSize) == 0;
return std::strncmp(Base::c_str(), chr, MaxSize) == 0;
}
/**
@@ -827,18 +827,18 @@ public:
* This operator can only be used with string-like arrays; otherwise it will fail to compile.
* @ref c_str()
*/
SelfType& operator=(const char* ch)
SelfType& operator=(const char* chr)
{
StaticAssert<Base::IsStringLike>::check();
StaticAssert<IsDynamic>::check();
Base::clear();
if (ch == UAVCAN_NULLPTR)
if (chr == UAVCAN_NULLPTR)
{
handleFatalError("Array::operator=(const char*)");
}
while (*ch)
while (*chr)
{
push_back(ValueType(*ch++)); // Value type is likely to be unsigned char, so conversion may be required.
push_back(ValueType(*chr++)); // Value type is likely to be unsigned char, so conversion may be required.
}
return *this;
}
@@ -847,17 +847,17 @@ public:
* This operator can only be used with string-like arrays; otherwise it will fail to compile.
* @ref c_str()
*/
SelfType& operator+=(const char* ch)
SelfType& operator+=(const char* chr)
{
StaticAssert<Base::IsStringLike>::check();
StaticAssert<IsDynamic>::check();
if (ch == UAVCAN_NULLPTR)
if (chr == UAVCAN_NULLPTR)
{
handleFatalError("Array::operator+=(const char*)");
}
while (*ch)
while (*chr)
{
push_back(ValueType(*ch++));
push_back(ValueType(*chr++));
}
return *this;
}