From 1146bcad2c77518ab964aabd3073d4031da43fcc Mon Sep 17 00:00:00 2001
From: Arkshine <hv.contact@gmail.com>
Date: Sat, 6 Dec 2014 12:22:29 +0100
Subject: [PATCH] C++11: Fix some code

---
 amxmodx/trie_natives.h   | 8 ++++----
 dlls/engine/engine.cpp   | 4 ++--
 dlls/engine/forwards.cpp | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/amxmodx/trie_natives.h b/amxmodx/trie_natives.h
index 3bc3b02b..8f190e50 100644
--- a/amxmodx/trie_natives.h
+++ b/amxmodx/trie_natives.h
@@ -39,11 +39,11 @@ public:
 		: control_(0)
 	{
 	}
-	Entry(ke::Moveable<Entry> other)
+	Entry(Entry &&other)
 	{
-		control_ = other->control_;
-		data_ = other->data_;
-		other->control_ = 0;
+		control_ = other.control_;
+		data_ = other.data_;
+		other.control_ = 0;
 	}
 	~Entry()
 	{
diff --git a/dlls/engine/engine.cpp b/dlls/engine/engine.cpp
index fb3f0c93..042dfa8e 100755
--- a/dlls/engine/engine.cpp
+++ b/dlls/engine/engine.cpp
@@ -82,12 +82,12 @@ static cell AMX_NATIVE_CALL register_touch(AMX *amx, cell *params)
 	Touch *p = new Touch;
 
 	if (!strlen(Toucher) || strcmp(Toucher, "*")==0) {
-		p->Toucher.setVoid();
+		p->Toucher = "";
 	} else {
 		p->Toucher = Toucher;
 	}
 	if (!strlen(Touched) || strcmp(Touched, "*")==0) {
-		p->Touched.setVoid();
+		p->Touched = "";
 	} else {
 		p->Touched = Touched;
 	}
diff --git a/dlls/engine/forwards.cpp b/dlls/engine/forwards.cpp
index 97926f67..7fcf4bc1 100755
--- a/dlls/engine/forwards.cpp
+++ b/dlls/engine/forwards.cpp
@@ -253,9 +253,9 @@ void pfnTouch(edict_t *pToucher, edict_t *pTouched)
 	META_RES res=MRES_IGNORED;
 	for (i=0; i<Touches.length(); i++)
 	{
-		if (Touches[i]->Toucher.isVoid())
+		if (Touches[i]->Toucher.length() == 0)
 		{
-			if (Touches[i]->Touched.isVoid())
+			if (Touches[i]->Touched.length() == 0)
 			{
 				retVal = MF_ExecuteForward(Touches[i]->Forward, (cell)ptrIndex, (cell)ptdIndex);
 				if (retVal & 2/*PLUGIN_HANDLED_MAIN*/)
@@ -270,7 +270,7 @@ void pfnTouch(edict_t *pToucher, edict_t *pTouched)
 					res=MRES_SUPERCEDE;
 			}
 		} else if (Touches[i]->Toucher.compare(ptrClass)==0) {
-			if (Touches[i]->Touched.isVoid())
+			if (Touches[i]->Touched.length() == 0)
 			{
 				retVal = MF_ExecuteForward(Touches[i]->Forward, (cell)ptrIndex, (cell)ptdIndex);
 				if (retVal & 2/*PLUGIN_HANDLED_MAIN*/)