From f0f0d2c8f63090e9d41449c10b0c2d966a94008d Mon Sep 17 00:00:00 2001 From: jp9000 Date: Thu, 8 Feb 2018 07:34:36 -0800 Subject: [PATCH] UI: Remove __FUNCTION__ usage This code was originally tested with visual C, which supports using __FUNCTION__ in this way. These potential error cases shouldn't technically happen anyway, so just remove __FUNCTION__. --- UI/window-basic-main-scene-collections.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UI/window-basic-main-scene-collections.cpp b/UI/window-basic-main-scene-collections.cpp index ff92c063f..113f84803 100644 --- a/UI/window-basic-main-scene-collections.cpp +++ b/UI/window-basic-main-scene-collections.cpp @@ -409,7 +409,7 @@ void OBSBasic::on_actionImportSceneCollection_triggered() obs_data_set_string(scenedata, "name", name.c_str()); if (!GetFileSafeName(name.c_str(), file)) { - blog(LOG_WARNING, __FUNCTION__ ": Failed to create " + blog(LOG_WARNING, "Failed to create " "safe file name for '%s'", name.c_str()); return; @@ -418,7 +418,7 @@ void OBSBasic::on_actionImportSceneCollection_triggered() string filePath = path + file; if (!GetClosestUnusedFileName(filePath, "json")) { - blog(LOG_WARNING, __FUNCTION__ ": Failed to get " + blog(LOG_WARNING, "Failed to get " "closest file name for %s", file.c_str()); return;