From 7bf9a23e28ef53a2f34ce00fc17491abc37939a2 Mon Sep 17 00:00:00 2001
From: no <rj150@hotmail.com>
Date: Wed, 13 Jan 2016 20:04:31 -0500
Subject: [PATCH] Try using stdstr_f instead to concatenate inside
 DisplayError().

---
 Source/Project64-core/N64System/Mips/PifRam.cpp        | 5 +----
 Source/Project64-core/N64System/Recompiler/RegInfo.cpp | 6 +-----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Source/Project64-core/N64System/Mips/PifRam.cpp b/Source/Project64-core/N64System/Mips/PifRam.cpp
index 3399bdc3a..9b1f09be9 100644
--- a/Source/Project64-core/N64System/Mips/PifRam.cpp
+++ b/Source/Project64-core/N64System/Mips/PifRam.cpp
@@ -289,10 +289,7 @@ void CPifRam::SI_DMA_READ()
     {
         if (bShowPifRamErrors())
         {
-            g_Notify->DisplayError(
-                __FUNCTION__ \
-                "\nSI_DRAM_ADDR_REG not in RDRam space"
-            );
+            g_Notify->DisplayError(stdstr_f("%s\nSI_DRAM_ADDR_REG not in RDRam space", __FUNCTION__).c_str());
         }
         return;
     }
diff --git a/Source/Project64-core/N64System/Recompiler/RegInfo.cpp b/Source/Project64-core/N64System/Recompiler/RegInfo.cpp
index c6e298a9f..1d3b705b8 100644
--- a/Source/Project64-core/N64System/Recompiler/RegInfo.cpp
+++ b/Source/Project64-core/N64System/Recompiler/RegInfo.cpp
@@ -1145,11 +1145,7 @@ void CRegInfo::UnMap_GPR(uint32_t Reg, bool WriteBackValue)
     {
         if (bHaveDebugger())
         {
-            g_Notify->DisplayError(
-                __FUNCTION__ \
-                "\n\n" \
-                "Why are you trying to unmap reg 0"
-            );
+            g_Notify->DisplayError(stdstr_f("%s\n\nWhy are you trying to unmap reg 0", __FUNCTION__).c_str());
         }
         return;
     }