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

Don't base Value on NT_Value.

Browse Source 
Also use std::string instead of NT_String.

Conversions to/from the internal structures will be done at the interface.
This commit is contained in:
Peter Johnson
2015-07-16 01:38:27 -07:00
committed by Peter Johnson
parent 555725a05b
commit 9906116d23
17 changed files with 870 additions and 984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Message.cpp
View File

@@ -59,8 +59,8 @@ std::shared_ptr<Message> Message::Read(WireDecoder& decoder,
if (decoder.proto_rev() >= 0x0300u) {
if (!decoder.Read8(&msg->m_flags)) return nullptr; // flags
}
msg->m_value = std::make_shared<Value>();
if (!decoder.ReadValue(type, &(*msg->m_value))) return nullptr;
msg->m_value = decoder.ReadValue(type);
if (!msg->m_value) return nullptr;
break;
}
case kEntryUpdate: {
@@ -73,8 +73,8 @@ std::shared_ptr<Message> Message::Read(WireDecoder& decoder,
type = static_cast<NT_Type>(itype);
} else
type = get_entry_type(msg->m_id);
msg->m_value = std::make_shared<Value>();
if (!decoder.ReadValue(type, &(*msg->m_value))) return nullptr;
msg->m_value = decoder.ReadValue(type);
if (!msg->m_value) return nullptr;
break;
}
case kFlagsUpdate: {
@@ -196,7 +196,7 @@ std::shared_ptr<Message> Message::EntryDelete(unsigned int id) {
}
std::shared_ptr<Message> Message::ExecuteRpc(unsigned int id, unsigned int uid,
llvm::ArrayRef<NT_Value> params) {
llvm::ArrayRef<Value> params) {
WireEncoder enc(0x0300);
for (auto& param : params) enc.WriteValue(param);
return ExecuteRpc(id, uid, enc.ToStringRef());
@@ -212,7 +212,7 @@ std::shared_ptr<Message> Message::ExecuteRpc(unsigned int id, unsigned int uid,
}
std::shared_ptr<Message> Message::RpcResponse(
unsigned int id, unsigned int uid, llvm::ArrayRef<NT_Value> results) {
unsigned int id, unsigned int uid, llvm::ArrayRef<Value> results) {
WireEncoder enc(0x0300);
for (auto& result : results) enc.WriteValue(result);
return RpcResponse(id, uid, enc.ToStringRef());