From 1d2dee3d830476c0adbbac653a3672ed025bbd3d Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 8 Mar 2017 08:34:29 +0000
Subject: [PATCH] Core: Fixed to compile with GCC

git-svn-id: svn://ultimatepp.org/upp/trunk@10920 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Convert.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/uppsrc/Core/Convert.cpp b/uppsrc/Core/Convert.cpp
index 0ea427606..68e329de7 100644
--- a/uppsrc/Core/Convert.cpp
+++ b/uppsrc/Core/Convert.cpp
@@ -500,21 +500,21 @@ ConvertString::~ConvertString() {}
 Value ConvertString::Scan(const Value& text) const {
 	if(IsError(text)) return text;
 	if(text.GetType() == STRING_V) {
-		String s = ~text;
+		String s = text;
 		if(trimleft)
 			s = Upp::TrimLeft(s);
 		if(trimright)
 			s = Upp::TrimRight(s);
-		if(IsNull(s)) return notnull ? NotNullError() : String();
+		if(IsNull(s)) return notnull ? NotNullError() : Value(s);
 		if(s.GetLength() <= maxlen) return s;
 	}
 	if(text.GetType() == WSTRING_V) {
-		WString s = ~text;
+		WString s = text;
 		if(trimleft)
 			s = Upp::TrimLeft(s);
 		if(trimright)
 			s = Upp::TrimRight(s);
-		if(IsNull(s)) return notnull ? NotNullError() : String();
+		if(IsNull(s)) return notnull ? NotNullError() : Value(s);
 		if(s.GetLength() <= maxlen) return s;
 	}
 	return ErrorValue(UPP::Format(t_("Please enter no more than %d characters."), maxlen));