BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed type casting issue with NormSenderNode::backoff_factor

pull/77/head
bebopagogo 2022-09-11 14:27:21 -04:00
parent acbc31c1d0
commit d00ebc22d2
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/normNode.h
View File

@ -556,7 +556,7 @@ class NormSenderNode : public NormNode, public ProtoTree::Item
UINT8 GetGrttQuantized() const UINT8 GetGrttQuantized() const
{return grtt_quantized;} {return grtt_quantized;}
UINT8 GetBackoffFactor() const double GetBackoffFactor() const
{return backoff_factor;} {return backoff_factor;}
UINT8 GetGroupSizeQuantized() const UINT8 GetGroupSizeQuantized() const
{return gsize_quantized;} {return gsize_quantized;}

2
makefiles/win32/normCast.vcxproj
View File

@ -249,6 +249,8 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\examples\normCast.cpp" /> <ClCompile Include="..\..\examples\normCast.cpp" />
<ClCompile Include="..\..\src\common\normPostProcess.cpp" />
<ClCompile Include="..\..\src\win32\win32PostProcess.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\protolib\makefiles\win32\Protokit.vcxproj"> <ProjectReference Include="..\..\protolib\makefiles\win32\Protokit.vcxproj">

2
src/common/normSession.cpp
View File

@ -3157,7 +3157,7 @@ bool NormSession::InsertRemoteSender(NormSenderNode &sender)
cmd.SetDestination(sender.GetAddress()); cmd.SetDestination(sender.GetAddress());
cmd.SetInstanceId(sender.GetInstanceId()); cmd.SetInstanceId(sender.GetInstanceId());
cmd.SetGrtt(sender.GetGrttQuantized()); cmd.SetGrtt(sender.GetGrttQuantized());
cmd.SetBackoffFactor(sender.GetBackoffFactor()); cmd.SetBackoffFactor((UINT8)sender.GetBackoffFactor());
cmd.SetGroupSize(sender.GetGroupSizeQuantized()); cmd.SetGroupSize(sender.GetGroupSizeQuantized());
cmd.SetCCSequence(sender.GetCCSequence()); cmd.SetCCSequence(sender.GetCCSequence());
// Adjust send time for any current hold time // Adjust send time for any current hold time