From 32fea6523fa77b4e7f24826ecea80d979c77f3df Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 9 Oct 2014 11:03:07 +0200 Subject: [PATCH] Use climits for ULONG_MAX rather than modern C++ option --- src/mirall/protocolwidget.cpp | 4 +++- src/mirall/syncengine.cpp | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mirall/protocolwidget.cpp b/src/mirall/protocolwidget.cpp index d44c8bc2bf..28c8426f08 100644 --- a/src/mirall/protocolwidget.cpp +++ b/src/mirall/protocolwidget.cpp @@ -29,6 +29,8 @@ #include "ui_protocolwidget.h" +#include + namespace Mirall { ProtocolWidget::ProtocolWidget(QWidget *parent) : @@ -262,7 +264,7 @@ void ProtocolWidget::computeResyncButtonEnabled() void ProtocolWidget::slotProgressInfo( const QString& folder, const Progress::Info& progress ) { - if( progress._completedFileCount == std::numeric_limits::max() ) { + if( progress._completedFileCount == ULLONG_MAX ) { // The sync is restarting, clean the old items cleanIgnoreItems(folder); computeResyncButtonEnabled(); diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp index 15e354f374..8354fdbec2 100644 --- a/src/mirall/syncengine.cpp +++ b/src/mirall/syncengine.cpp @@ -29,6 +29,7 @@ #include #endif +#include #include #include @@ -656,7 +657,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult) // To announce the beginning of the sync emit aboutToPropagate(_syncedItems); - _progressInfo._completedFileCount = std::numeric_limits::max(); // indicate the start with max + _progressInfo._completedFileCount = ULLONG_MAX; // indicate the start with max emit transmissionProgress(_progressInfo); _progressInfo._completedFileCount = 0;