summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2018-05-24 14:49:10 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-05-24 14:49:10 +0200
commitc40d14c78b6eaae9dd7ea0c00e49d99a1121d189 (patch)
treebc130141514eeea43899d11de175b096a14edb1f /common
parent44d77a4e65dcc5d79a1e924a139ec65a9a1e8f9d (diff)
downloadsink-c40d14c78b6eaae9dd7ea0c00e49d99a1121d189.tar.gz
sink-c40d14c78b6eaae9dd7ea0c00e49d99a1121d189.zip
Fixed a bunch of warnings
Diffstat (limited to 'common')
-rw-r--r--common/commandprocessor.cpp5
-rw-r--r--common/facade.cpp2
-rw-r--r--common/genericresource.cpp4
-rw-r--r--common/inspector.cpp5
-rw-r--r--common/storage_lmdb.cpp7
-rw-r--r--common/synchronizer.cpp5
6 files changed, 2 insertions, 26 deletions
diff --git a/common/commandprocessor.cpp b/common/commandprocessor.cpp
index 3507ef1..8b6e685 100644
--- a/common/commandprocessor.cpp
+++ b/common/commandprocessor.cpp
@@ -364,8 +364,3 @@ KAsync::Job<void> CommandProcessor::processAllMessages()
364 }); 364 });
365} 365}
366 366
367#pragma clang diagnostic push
368#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
369#include "commandprocessor.moc"
370#include "moc_commandprocessor.cpp"
371#pragma clang diagnostic pop
diff --git a/common/facade.cpp b/common/facade.cpp
index 9c14a23..92eeaca 100644
--- a/common/facade.cpp
+++ b/common/facade.cpp
@@ -115,5 +115,3 @@ QPair<KAsync::Job<void>, typename ResultEmitter<typename DomainType::Ptr>::Ptr>
115 template class Sink::GenericFacade<T>; \ 115 template class Sink::GenericFacade<T>; \
116 116
117SINK_REGISTER_TYPES() 117SINK_REGISTER_TYPES()
118
119#include "facade.moc"
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 9cf91da..bd97036 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -166,7 +166,3 @@ void GenericResource::setLowerBoundRevision(qint64 revision)
166 updateLowerBoundRevision(); 166 updateLowerBoundRevision();
167} 167}
168 168
169#pragma clang diagnostic push
170#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
171#include "genericresource.moc"
172#pragma clang diagnostic pop
diff --git a/common/inspector.cpp b/common/inspector.cpp
index 0e7a61f..0fa0f3d 100644
--- a/common/inspector.cpp
+++ b/common/inspector.cpp
@@ -90,8 +90,3 @@ KAsync::Job<void> Inspector::inspect(int inspectionType, const QByteArray &inspe
90 return KAsync::error(-1, "Inspection not implemented."); 90 return KAsync::error(-1, "Inspection not implemented.");
91} 91}
92 92
93#pragma clang diagnostic push
94#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
95#include "inspector.moc"
96#include "moc_inspector.cpp"
97#pragma clang diagnostic pop
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index 2f6e7e1..ddad69d 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -570,11 +570,8 @@ int DataStore::NamedDatabase::findAllInRange(const QByteArray &lowerBound, const
570 return 0; 570 return 0;
571 } 571 }
572 572
573 int numberOfRetrievedValues = 0; 573 MDB_val firstKey = {(size_t)lowerBound.size(), (void *)lowerBound.constData()};
574 574 MDB_val idealLastKey = {(size_t)upperBound.size(), (void *)upperBound.constData()};
575 MDB_val firstKey = { .mv_size = (size_t)lowerBound.size(), .mv_data = (void *)lowerBound.constData() };
576 MDB_val idealLastKey = { .mv_size = (size_t)upperBound.size(), .mv_data = (void *)upperBound.constData() };
577 MDB_val lastKey = idealLastKey;
578 MDB_val currentKey; 575 MDB_val currentKey;
579 MDB_val data; 576 MDB_val data;
580 577
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index 037a01f..41ab1e9 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -741,8 +741,3 @@ bool Synchronizer::allChangesReplayed()
741 741
742SINK_REGISTER_TYPES() 742SINK_REGISTER_TYPES()
743 743
744#pragma clang diagnostic push
745#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
746#include "synchronizer.moc"
747#include "moc_synchronizer.cpp"
748#pragma clang diagnostic pop