Remove removed containers

Co-authored-by: arthurdead <arthur.kinder@gmail.com>

Author: 2 people

AMBuildScript

@@ -126,7 +126,7 @@ class ExtensionConfig(object):
       '-fvisibility=hidden',
     ]
     cxx.cxxflags += [
-      '-std=c++11',
+      '-std=c++14',
       '-fno-exceptions',
       '-fno-threadsafe-statics',
       '-Wno-non-virtual-dtor',

types/mempatch.cpp

@@ -13,12 +13,12 @@ HandleType_t g_MemoryPatchType = 0;
 void ByteVectorRead(ByteVector &vec, uint8_t* mem, size_t count) {
 	vec.clear();
 	for (size_t i = 0; i < count; i++) {
-		vec.append(mem[i]);
+		vec.push_back(mem[i]);
 	}
 }
 
 void ByteVectorWrite(ByteVector &vec, uint8_t* mem) {
-	for (size_t i = 0; i < vec.length(); i++) {
+	for (size_t i = 0; i < vec.size(); i++) {
 		mem[i] = vec[i];
 	}
 }
@@ -27,38 +27,38 @@ class MemoryPatch {
 public:
 	MemoryPatch(uintptr_t pAddress, const MemPatchGameConfig::MemoryPatchInfo& info) {
 		for (auto bit : info.vecPatch) {
-			this->vecPatch.append(bit);
+			this->vecPatch.push_back(bit);
 		}
 		for (auto bit : info.vecVerify) {
-			this->vecVerify.append(bit);
+			this->vecVerify.push_back(bit);
 		}
 		for (auto bit : info.vecPreserve) {
-			this->vecPreserve.append(bit);
+			this->vecPreserve.push_back(bit);
 		}
 
 		// ignore offset if address is bad
 		this->pAddress = pAddress ? pAddress + (info.offset) : 0;
 	}
 
 	bool Enable() {
-		if (vecRestore.length() > 0) {
+		if (vecRestore.size() > 0) {
 			// already patched, disregard
 			return false;
 		}
 
 		if (!this->Verify()) {
 			return false;
 		}
-		ByteVectorRead(vecRestore, (uint8_t*) pAddress, vecPatch.length());
+		ByteVectorRead(vecRestore, (uint8_t*) pAddress, vecPatch.size());
 
-		SourceHook::SetMemAccess((void*) this->pAddress, vecPatch.length() * sizeof(uint8_t),
+		SourceHook::SetMemAccess((void*) this->pAddress, vecPatch.size() * sizeof(uint8_t),
 				SH_MEM_READ | SH_MEM_WRITE | SH_MEM_EXEC);
 		ByteVectorWrite(vecPatch, (uint8_t*) pAddress);
 
 		// 
-		for (size_t i = 0; i < vecPatch.length(); i++) {
+		for (size_t i = 0; i < vecPatch.size(); i++) {
 			uint8_t preserveBits = 0;
-			if (i < vecPreserve.length()) {
+			if (i < vecPreserve.size()) {
 				preserveBits = vecPreserve[i];
 			}
 			*((uint8_t*) pAddress + i) = (vecPatch[i] & ~preserveBits) | (vecRestore[i] & preserveBits);
@@ -68,7 +68,7 @@ class MemoryPatch {
 	}
 
 	void Disable() {
-		if (vecRestore.length() == 0) {
+		if (vecRestore.size() == 0) {
 			// no memory to restore, fug
 			return;
 		}
@@ -82,7 +82,7 @@ class MemoryPatch {
 		}
 
 		auto addr = (uint8_t*) pAddress;
-		for (size_t i = 0; i < this->vecVerify.length(); i++) {
+		for (size_t i = 0; i < this->vecVerify.size(); i++) {
 			if (vecVerify[i] != '*' && vecVerify[i] != addr[i]) {
 				return false;
 			}
@@ -129,8 +129,8 @@ cell_t sm_MemoryPatchLoadFromConfig(IPluginContext *pContext, const cell_t *para
 	}
 
 	void* addr;
-	if (!pConfig->GetMemSig(info.signature.chars(), &addr)) {
-		return pContext->ThrowNativeError("Failed to locate signature for '%s' (mempatch '%s')", info.signature.chars(), name);
+	if (!pConfig->GetMemSig(info.signature.c_str(), &addr)) {
+		return pContext->ThrowNativeError("Failed to locate signature for '%s' (mempatch '%s')", info.signature.c_str(), name);
 	}
 
 	MemoryPatch *pMemoryPatch = new MemoryPatch((uintptr_t) addr, info);

userconf/mempatches.cpp

@@ -10,7 +10,7 @@ unsigned int g_IgnoreLevel;
 // The parent section type of a platform specific "windows" or "linux" section.
 MemPatchGameConfig::ParseState g_PlatformOnlyState;
 
-ke::AString g_CurrentSection;
+std::string g_CurrentSection;
 MemPatchGameConfig::MemoryPatchInfo *g_CurrentPatchInfo;
 
 /**
@@ -25,7 +25,7 @@ ByteVector ByteVectorFromString(const char* s) {
 	char* p = strtok(s1, "\\x ");
 	while (p) {
 		uint8_t byte = strtol(p, nullptr, 16);
-		payload.append(byte);
+		payload.push_back(byte);
 		p = strtok(nullptr, "\\x ");
 	}
 	free(s1);
@@ -72,7 +72,7 @@ SMCResult MemPatchGameConfig::ReadSMC_NewSection(const SMCStates *states, const
 	// Handle platform specific sections first.
 	if (IsTargetPlatformSection(name)) {
 		if (g_IgnoreLevel > 0) {
-			smutils->LogError(myself, "Unreachable platform specific section in \"%s\" Function: line: %i col: %i", g_CurrentPatchInfo->signature.chars(), states->line, states->col);
+			smutils->LogError(myself, "Unreachable platform specific section in \"%s\" Function: line: %i col: %i", g_CurrentPatchInfo->signature.c_str(), states->line, states->col);
 			return SMCResult_HaltFail;
 		}
 
@@ -85,7 +85,7 @@ SMCResult MemPatchGameConfig::ReadSMC_NewSection(const SMCStates *states, const
 		return SMCResult_Continue;
 	} else if (IsNonTargetPlatformSection(name)) {
 		if (g_PlatformOnlyState != PState_None) {
-			smutils->LogError(myself, "Unreachable platform specific section in \"%s\" Function: line: %i col: %i", g_CurrentPatchInfo->signature.chars(), states->line, states->col);
+			smutils->LogError(myself, "Unreachable platform specific section in \"%s\" Function: line: %i col: %i", g_CurrentPatchInfo->signature.c_str(), states->line, states->col);
 			return SMCResult_HaltFail;
 		}
 		g_IgnoreLevel++;
@@ -168,7 +168,7 @@ SMCResult MemPatchGameConfig::ReadSMC_LeavingSection(const SMCStates *states) {
 	case PState_Runtime:
 		// pop section info
 		g_ParseState = PState_Root;
-		m_MemPatchInfoMap.insert(g_CurrentSection.chars(), g_CurrentPatchInfo);
+		m_MemPatchInfoMap.insert(g_CurrentSection.c_str(), g_CurrentPatchInfo);
 
 		g_CurrentPatchInfo = nullptr;
 		g_CurrentSection = "";

userconf/mempatches.h

@@ -6,11 +6,9 @@
 
 #include "extension.h"
 
-#include <am-string.h>
-#include <am-vector.h>
 #include <sm_stringhashmap.h>
 
-using ByteVector = ke::Vector<uint8_t>;
+using ByteVector = std::vector<uint8_t>;
 
 class MemPatchGameConfig : public ITextListener_SMC {
 public:
@@ -22,7 +20,7 @@ class MemPatchGameConfig : public ITextListener_SMC {
 public:
 	class MemoryPatchInfo {
 	public:
-		ke::AString signature;
+		std::string signature;
 		size_t offset;
 		ByteVector vecPatch, vecVerify, vecPreserve;
 	};