build fixed

This commit is contained in:
Matej Sekoranja
2013-12-03 12:55:25 +01:00
parent 8021361768
commit 344ba439ba
2 changed files with 3 additions and 4 deletions

View File

@@ -1039,8 +1039,8 @@ namespace pvAccess {
// poor throughput performances when transferring large amount of
// data. See Microsoft KB article KB823764.
// We do it also for other systems just to be safe.
int maxBytesToSend = min(_socketSendBufferSize,
_remoteTransportSocketReceiveBufferSize)/2;
int maxBytesToSend = std::min(_socketSendBufferSize,
static_cast<int>(_remoteTransportSocketReceiveBufferSize))/2;
int limit = buffer->getLimit();
int bytesToSend = limit-buffer->getPosition();

View File

@@ -9,7 +9,6 @@
#include <pv/serverContext.h>
#include <pv/clientFactory.h>
#include <pv/clientContextImpl.h>
#include "channelAccessIFTest.h"
@@ -58,7 +57,7 @@ class ChannelAccessIFRemoteTest: public ChannelAccessIFTest {
virtual ChannelProvider::shared_pointer getChannelProvider() {
return getChannelAccess()->getProvider(
ClientContextImpl::PROVIDER_NAME);
"pva");
}