From 67af2e0e0c8c5312be6487fe945f04b9e617af2c Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sun, 4 Feb 2024 00:08:54 -0600 Subject: [PATCH] resolve ambiguity clang + ninja via clion disliked a string assignment from a case that could feed a string either another string or a char *, soi used the latter acroiss the board --- Engine/source/gui/worldEditor/worldEditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/gui/worldEditor/worldEditor.cpp b/Engine/source/gui/worldEditor/worldEditor.cpp index 9ab1791d1..5f305ae06 100644 --- a/Engine/source/gui/worldEditor/worldEditor.cpp +++ b/Engine/source/gui/worldEditor/worldEditor.cpp @@ -488,7 +488,7 @@ bool WorldEditor::pasteSelection( bool dropSel ) continue; StringTableEntry baseName = obj->getName(); - String outName = (baseName != StringTable->EmptyString()) ? Sim::getUniqueName(baseName) : StringTable->EmptyString(); + const char * outName = (baseName != StringTable->EmptyString()) ? Sim::getUniqueName(baseName).c_str() : StringTable->EmptyString(); obj->assignName(outName); if (targetGroup)