OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 23:46:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

gRPC: Fix Linux build issues

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-05-24 07:55:15 +02:00
parent cc031e7895
commit 79645ceed9
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/CMakeLists.txt
View File

@ -321,6 +321,8 @@ if (MSVC)
endif(RESINSIGHT_ENABLE_GRPC) endif(RESINSIGHT_ENABLE_GRPC)
elseif (APPLE) elseif (APPLE)
set( EXE_FILES MACOSX_BUNDLE) set( EXE_FILES MACOSX_BUNDLE)
else()
set_source_files_properties(${GRPC_CPP_SOURCES} PROPERTIES COMPILE_FLAGS "-Woverloaded-virtual")
endif() endif()
set( EXE_FILES set( EXE_FILES
${EXE_FILES} ${EXE_FILES}

4
ApplicationCode/GrpcInterface/RiaGrpcCallbacks.inl
View File

@ -298,7 +298,7 @@ void RiaGrpcClientStreamCallback<ServiceT, RequestT, ReplyT, StateHandlerT>::onI
this->setNextCallState(RiaAbstractGrpcCallback::INIT_REQUEST_COMPLETED); this->setNextCallState(RiaAbstractGrpcCallback::INIT_REQUEST_COMPLETED);
// The read call will start reading the request data and push this callback back onto the command queue // The read call will start reading the request data and push this callback back onto the command queue
// when the read call is completed. // when the read call is completed.
m_reader.Read(&m_request, this); m_reader.Read(&this->m_request, this);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -320,7 +320,7 @@ void RiaGrpcClientStreamCallback<ServiceT, RequestT, ReplyT, StateHandlerT>::onI
} }
// Start reading and push this back onto the command queue. // Start reading and push this back onto the command queue.
m_reader.Read(&m_request, this); m_reader.Read(&this->m_request, this);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/GrpcInterface/RiaGrpcPropertiesService.cpp
View File

@ -75,7 +75,7 @@ public:
if (resultData->ensureKnownResultLoaded(resAddr)) if (resultData->ensureKnownResultLoaded(resAddr))
{ {
if (timeStep < (int)resultData->timeStepCount(resAddr)) if (timeStep < resultData->timeStepCount(resAddr))
{ {
initResultAccess(caseData, request->grid_index(), porosityModel, timeStep, resAddr); initResultAccess(caseData, request->grid_index(), porosityModel, timeStep, resAddr);
return grpc::Status::OK; return grpc::Status::OK;