Skip to content

Commit

Permalink
Merge pull request #17753 from jakesmith/HPCC-30247-tuple-build-fix
Browse files Browse the repository at this point in the history
HPCC-30247 Fix centos8 std::tuple build issue

Reviewed-by: Gavin Halliday <[email protected]>
Merged-by: Gavin Halliday <[email protected]>
  • Loading branch information
ghalliday authored Sep 8, 2023
2 parents db240a3 + b9c57c9 commit 6fcf405
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions ecl/agentexec/agentexec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ int CEclAgentExecutionServer::run()

//---------------------------------------------------------------------------------

typedef std::tuple<Linked<IJobQueueItem>, unsigned, const char *, const char *> ThreadCtx;
typedef std::tuple<IJobQueueItem *, unsigned, const char *, const char *> ThreadCtx;

// NB: WaitThread only used by if pool created (see CEclAgentExecutionServer ctor)
class WaitThread : public CInterfaceOf<IPooledThread>
Expand All @@ -237,7 +237,9 @@ class WaitThread : public CInterfaceOf<IPooledThread>
virtual void init(void *param) override
{
auto &context = *static_cast<ThreadCtx *>(param);
std::tie(item, wfid, wuid, graphName) = context;
IJobQueueItem *tmpItem;
std::tie(tmpItem, wfid, wuid, graphName) = context;
item.set(tmpItem);
}
virtual bool stop() override
{
Expand Down

0 comments on commit 6fcf405

Please sign in to comment.