Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-28 02:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use nullptr.

Browse Source 
Change-Id: I469bbe4994ea22a22d2d72e47d72cab606d43eef
This commit is contained in:
Peter Johnson
2015-06-22 23:30:32 -07:00
parent 42ad98567c
commit 0aab4c27e1
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nt_value.cpp
View File

@@ -16,11 +16,11 @@ bool
operator== (const NT_Value& lhs, const NT_Value& rhs)
{
if (lhs.type != rhs.type)
return 0;
return false;
switch (lhs.type)
{
case NT_UNASSIGNED:
return 1; // XXX: is this better being false instead?
return true; // XXX: is this better being false instead?
case NT_BOOLEAN:
return lhs.data.v_boolean == rhs.data.v_boolean;
case NT_DOUBLE:
@@ -29,39 +29,39 @@ operator== (const NT_Value& lhs, const NT_Value& rhs)
case NT_RAW:
case NT_RPC:
if (lhs.data.v_string.len != rhs.data.v_string.len)
return 0;
return false;
return std::memcmp(lhs.data.v_string.str, rhs.data.v_string.str,
lhs.data.v_string.len) == 0;
case NT_BOOLEAN_ARRAY:
if (lhs.data.arr_boolean.size != rhs.data.arr_boolean.size)
return 0;
return false;
return std::memcmp(lhs.data.arr_boolean.arr, rhs.data.arr_boolean.arr,
lhs.data.arr_boolean.size *
sizeof(lhs.data.arr_boolean.arr[0])) == 0;
case NT_DOUBLE_ARRAY:
if (lhs.data.arr_double.size != rhs.data.arr_double.size)
return 0;
return false;
return std::memcmp(lhs.data.arr_double.arr, rhs.data.arr_double.arr,
lhs.data.arr_double.size *
sizeof(lhs.data.arr_double.arr[0])) == 0;
case NT_STRING_ARRAY:
{
if (lhs.data.arr_string.size != rhs.data.arr_string.size)
return 0;
return false;
for (size_t i=0; i<lhs.data.arr_string.size; i++)
{
if (lhs.data.arr_string.arr[i].len !=
rhs.data.arr_string.arr[i].len)
return 0;
return false;
if (std::memcmp(lhs.data.arr_string.arr[i].str,
rhs.data.arr_string.arr[i].str,
lhs.data.arr_string.arr[i].len) != 0)
return 0;
return false;
}
return 1;
return true;
}
default:
/*assert(0 && "unknown value type");*/
return 0;
//assert(false && "unknown value type");
return false;
}
}