diff --git a/Source/CCRakNetSlidingWindow.cpp b/Source/CCRakNetSlidingWindow.cpp index d8c25d3d6..d5b2eefd6 100644 --- a/Source/CCRakNetSlidingWindow.cpp +++ b/Source/CCRakNetSlidingWindow.cpp @@ -198,11 +198,11 @@ void CCRakNetSlidingWindow::OnNAK(CCTimeType curTime, DatagramSequenceNumberType } } // ---------------------------------------------------------------------------------------------------------------------------- -void CCRakNetSlidingWindow::OnAck(CCTimeType curTime, CCTimeType rtt, bool hasBAndAS, BytesPerMicrosecond _BB, BytesPerMicrosecond _AS, double totalUserDataBytesAcked, bool isContinuousSend, DatagramSequenceNumberType sequenceNumber ) +void CCRakNetSlidingWindow::OnAck(CCTimeType curTime, CCTimeType rtt, bool hasBAndAS, BytesPerMicrosecond BB_, BytesPerMicrosecond AS_, double totalUserDataBytesAcked, bool isContinuousSend, DatagramSequenceNumberType sequenceNumber ) { - (void) _BB; + (void) BB_; (void) totalUserDataBytesAcked; - (void) _AS; + (void) AS_; (void) hasBAndAS; (void) curTime; (void) rtt; @@ -261,11 +261,11 @@ void CCRakNetSlidingWindow::OnDuplicateAck( CCTimeType curTime, DatagramSequence (void) sequenceNumber; } // ---------------------------------------------------------------------------------------------------------------------------- -void CCRakNetSlidingWindow::OnSendAckGetBAndAS(CCTimeType curTime, bool *hasBAndAS, BytesPerMicrosecond *_BB, BytesPerMicrosecond *_AS) +void CCRakNetSlidingWindow::OnSendAckGetBAndAS(CCTimeType curTime, bool *hasBAndAS, BytesPerMicrosecond *BB_, BytesPerMicrosecond *AS_) { (void) curTime; - (void) _BB; - (void) _AS; + (void) BB_; + (void) AS_; *hasBAndAS=false; } diff --git a/Source/CCRakNetSlidingWindow.h b/Source/CCRakNetSlidingWindow.h index 9fe7a6371..e945b9829 100644 --- a/Source/CCRakNetSlidingWindow.h +++ b/Source/CCRakNetSlidingWindow.h @@ -129,12 +129,12 @@ class CCRakNetSlidingWindow /// hasBAndAS are possibly written with the ack, see OnSendAck() /// B and AS are used in the calculations in UpdateWindowSizeAndAckOnAckPerSyn /// B and AS are updated at most once per SYN - void OnAck(CCTimeType curTime, CCTimeType rtt, bool hasBAndAS, BytesPerMicrosecond _BB, BytesPerMicrosecond _AS, double totalUserDataBytesAcked, bool isContinuousSend, DatagramSequenceNumberType sequenceNumber ); + void OnAck(CCTimeType curTime, CCTimeType rtt, bool hasBAndAS, BytesPerMicrosecond BB_, BytesPerMicrosecond AS_, double totalUserDataBytesAcked, bool isContinuousSend, DatagramSequenceNumberType sequenceNumber ); void OnDuplicateAck( CCTimeType curTime, DatagramSequenceNumberType sequenceNumber ); /// Call when you send an ack, to see if the ack should have the B and AS parameters transmitted /// Call before calling OnSendAck() - void OnSendAckGetBAndAS(CCTimeType curTime, bool *hasBAndAS, BytesPerMicrosecond *_BB, BytesPerMicrosecond *_AS); + void OnSendAckGetBAndAS(CCTimeType curTime, bool *hasBAndAS, BytesPerMicrosecond *BB_, BytesPerMicrosecond *AS_); /// Call when we send an ack, to write B and AS if needed /// B and AS are only written once per SYN, to prevent slow calculations