rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#6344 Fix use of std::max

This commit is contained in:
Andrew Nelless 2017-01-24 16:21:06 +00:00 committed by Nick Bolton
parent 8af215364f
commit 828ad24820
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/client/Client.cpp
View File

@ -45,6 +45,7 @@
#include <sstream> #include <sstream>
#include <fstream> #include <fstream>
#include <algorithm> #include <algorithm>
#include <climits>
// //
// Client // Client
@ -75,7 +76,7 @@ Client::Client(
m_useSecureNetwork(args.m_enableCrypto), m_useSecureNetwork(args.m_enableCrypto),
m_args(args), m_args(args),
m_enableClipboard(true), m_enableClipboard(true),
m_maximumClipboardSize(INT32_MAX) m_maximumClipboardSize(INT_MAX)
{ {
assert(m_socketFactory != NULL); assert(m_socketFactory != NULL);
assert(m_screen != NULL); assert(m_screen != NULL);
@ -370,7 +371,7 @@ Client::setOptions(const OptionsList& options)
} else if (id == kOptionClipboardSharingSize) { } else if (id == kOptionClipboardSharingSize) {
index++; index++;
if (index != options.end()) { if (index != options.end()) {
m_maximumClipboardSize = std::max(0u, *index); m_maximumClipboardSize = *index;
} }
} }
} }

3
src/lib/server/Server.cpp
View File

@ -51,6 +51,7 @@
#include <sstream> #include <sstream>
#include <fstream> #include <fstream>
#include <ctime> #include <ctime>
#include <climits>
// //
// Server // Server
@ -94,7 +95,7 @@ Server::Server(
m_ignoreFileTransfer(false), m_ignoreFileTransfer(false),
m_disableLockToScreen(false), m_disableLockToScreen(false),
m_enableClipboard(true), m_enableClipboard(true),
m_maximumClipboardSize(INT32_MAX), m_maximumClipboardSize(INT_MAX),
m_sendDragInfoThread(NULL), m_sendDragInfoThread(NULL),
m_waitDragInfoThread(true), m_waitDragInfoThread(true),
m_args(args) m_args(args)