From 550078f7cb37fb8833ae2bc86de26a78f59232cc Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 12 Nov 2017 21:21:51 -1000 Subject: [PATCH] Linux build fixes --- Runtime/Character/CParticleDatabase.cpp | 2 +- amuse | 2 +- hecl | 2 +- nod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Runtime/Character/CParticleDatabase.cpp b/Runtime/Character/CParticleDatabase.cpp index 12fe416ab..16ebfe130 100644 --- a/Runtime/Character/CParticleDatabase.cpp +++ b/Runtime/Character/CParticleDatabase.cpp @@ -505,7 +505,7 @@ void CParticleDatabase::InsertParticleGen(bool oneShot, int flags, std::string_v useMap = &x3c_rendererDrawLoop; } - useMap->insert(std::make_pair(name, std::move(gen))); + useMap->insert(std::make_pair(std::string(name), std::move(gen))); if (flags & 0x60) xb4_25_drawingEnds = true; diff --git a/amuse b/amuse index 75830dc6d..03d597b0a 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit 75830dc6ddf3550eecefd59c5a1d77bfc18b6e36 +Subproject commit 03d597b0ac1a09d3c1e8f4608d55401511cf6b32 diff --git a/hecl b/hecl index 6e571a0e5..38c511f5b 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 6e571a0e5a09e641f8bc95b8fd1b96e716bfdfbd +Subproject commit 38c511f5b53cbb161c89a1c3f2ac3ae4e9ac7c2d diff --git a/nod b/nod index 27a2cb599..69e96e3b3 160000 --- a/nod +++ b/nod @@ -1 +1 @@ -Subproject commit 27a2cb5998414d937ed9f0fd2a958744851505d8 +Subproject commit 69e96e3b3c069ea38fd315dac4af9c82d3b6774c