From 12511901a9bad692d602c00110181b0d5ee4966a Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sat, 10 Mar 2012 02:16:20 +0000
Subject: [PATCH] Fix bad string concatenation in a json parse error message

Originally committed to SVN as r6559.
---
 aegisub/libaegisub/common/cajun/reader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aegisub/libaegisub/common/cajun/reader.cpp b/aegisub/libaegisub/common/cajun/reader.cpp
index 221d377aa..ee54c55fe 100644
--- a/aegisub/libaegisub/common/cajun/reader.cpp
+++ b/aegisub/libaegisub/common/cajun/reader.cpp
@@ -232,7 +232,7 @@ void Reader::MatchString(std::string& string, InputStream& inputStream) {
 				case 't':  string.push_back('\t'); break;
 				case 'u':  // TODO: what do we do with this?
 				default:
-					throw ScanException("Unrecognized escape sequence found in string: \\" + c, inputStream.GetLocation());
+					throw ScanException(std::string("Unrecognized escape sequence found in string: \\") + c, inputStream.GetLocation());
 			}
 		}
 		else {