From 32a2d9b61193db0a3f7ab6f45113c7d3d1ce6a92 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 8 May 2017 23:38:36 +0200 Subject: Fixed warnings --- common/pipeline.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'common/pipeline.cpp') diff --git a/common/pipeline.cpp b/common/pipeline.cpp index f5cf995..dc6f128 100644 --- a/common/pipeline.cpp +++ b/common/pipeline.cpp @@ -283,6 +283,8 @@ KAsync::Job Pipeline::modifiedEntity(void const *command, size_t size) case Preprocessor::DropModification: SinkTraceCtx(d->logCtx) << "Dropping modification"; return KAsync::error(0); + case Preprocessor::NoAction: + case Preprocessor::DeleteEntity: default: break; } -- cgit v1.2.3 From 5cabc167e646e9d80b70d6617a3f031d77453979 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 23 Jun 2017 10:20:03 +0200 Subject: Build with flatbuffers 1.7 There's a new template version that expects methods that QByteArray doesn't have but breaks the implicit conversion to const char *, std::string is safer anyways (doesn't require a null terminated string). --- common/pipeline.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'common/pipeline.cpp') diff --git a/common/pipeline.cpp b/common/pipeline.cpp index dc6f128..f29c7db 100644 --- a/common/pipeline.cpp +++ b/common/pipeline.cpp @@ -303,8 +303,8 @@ KAsync::Job Pipeline::modifiedEntity(void const *command, size_t size) SinkTraceCtx(d->logCtx) << "Move of " << current.identifier() << "was successfull"; if (isMove) { flatbuffers::FlatBufferBuilder fbb; - auto entityId = fbb.CreateString(current.identifier()); - auto type = fbb.CreateString(bufferType); + auto entityId = fbb.CreateString(current.identifier().toStdString()); + auto type = fbb.CreateString(bufferType.toStdString()); auto location = Sink::Commands::CreateDeleteEntity(fbb, current.revision(), entityId, type, true); Sink::Commands::FinishDeleteEntityBuffer(fbb, location); const auto data = BufferUtils::extractBuffer(fbb); @@ -450,8 +450,8 @@ void Preprocessor::createEntity(const Sink::ApplicationDomain::ApplicationDomain const auto entityBuffer = BufferUtils::extractBuffer(entityFbb); flatbuffers::FlatBufferBuilder fbb; - auto entityId = fbb.CreateString(entity.identifier()); - auto type = fbb.CreateString(typeName); + auto entityId = fbb.CreateString(entity.identifier().toStdString()); + auto type = fbb.CreateString(typeName.toStdString()); auto delta = Sink::EntityBuffer::appendAsVector(fbb, entityBuffer.constData(), entityBuffer.size()); auto location = Sink::Commands::CreateCreateEntity(fbb, entityId, type, delta); Sink::Commands::FinishCreateEntityBuffer(fbb, location); -- cgit v1.2.3