From c87b3c08592940a346ae3ba642697011d347805b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 26 Aug 2015 17:59:51 -0400 Subject: [PATCH] Update to the latest AMTL version. --- core/MenuStyle_Base.h | 4 ++-- core/logic/ProfileTools.h | 6 +++--- core/logic/smn_adt_trie.cpp | 2 +- core/logic/smn_filesystem.cpp | 36 +++++++++++++++++------------------ core/vprof_tool.h | 22 ++++++++++----------- public/amtl | 2 +- sourcepawn | 2 +- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/core/MenuStyle_Base.h b/core/MenuStyle_Base.h index a9afe7b6..c6570816 100644 --- a/core/MenuStyle_Base.h +++ b/core/MenuStyle_Base.h @@ -71,8 +71,8 @@ public: unsigned int access; private: - CItem(const CItem &other) KE_DELETE; - CItem &operator =(const CItem &other) KE_DELETE; + CItem(const CItem &other) = delete; + CItem &operator =(const CItem &other) = delete; }; class CBaseMenuPlayer diff --git a/core/logic/ProfileTools.h b/core/logic/ProfileTools.h index c7e31ccd..d73e01f4 100644 --- a/core/logic/ProfileTools.h +++ b/core/logic/ProfileTools.h @@ -44,11 +44,11 @@ public: ProfileToolManager(); // SMGlobalClass - void OnSourceModAllInitialized() KE_OVERRIDE; - void OnSourceModShutdown() KE_OVERRIDE; + void OnSourceModAllInitialized() override; + void OnSourceModShutdown() override; // IRootConsoleCommand - void OnRootConsoleCommand2(const char *cmdname, const ICommandArgs *args) KE_OVERRIDE; + void OnRootConsoleCommand2(const char *cmdname, const ICommandArgs *args) override; void RegisterTool(IProfilingTool *tool) { tools_.append(tool); diff --git a/core/logic/smn_adt_trie.cpp b/core/logic/smn_adt_trie.cpp index 7b706489..c4e5afc9 100644 --- a/core/logic/smn_adt_trie.cpp +++ b/core/logic/smn_adt_trie.cpp @@ -121,7 +121,7 @@ public: } private: - Entry(const Entry &other) KE_DELETE; + Entry(const Entry &other) = delete; ArrayInfo *ensureArray(size_t bytes) { ArrayInfo *array = raw(); diff --git a/core/logic/smn_filesystem.cpp b/core/logic/smn_filesystem.cpp index c499b2af..6dd3d169 100644 --- a/core/logic/smn_filesystem.cpp +++ b/core/logic/smn_filesystem.cpp @@ -116,33 +116,33 @@ public: return true; } - size_t Read(void *pOut, int size) KE_OVERRIDE { + size_t Read(void *pOut, int size) override { return (size_t)smcore.filesystem->Read(pOut, size, handle_); } - char *ReadLine(char *pOut, int size) KE_OVERRIDE { + char *ReadLine(char *pOut, int size) override { return smcore.filesystem->ReadLine(pOut, size, handle_); } - size_t Write(const void *pData, int size) KE_OVERRIDE { + size_t Write(const void *pData, int size) override { return (size_t)smcore.filesystem->Write(pData, size, handle_); } - bool Seek(int pos, int seek_type) KE_OVERRIDE { + bool Seek(int pos, int seek_type) override { smcore.filesystem->Seek(handle_, pos, seek_type); return !HasError(); } - int Tell() KE_OVERRIDE { + int Tell() override { return smcore.filesystem->Tell(handle_); } - bool HasError() KE_OVERRIDE { + bool HasError() override { return !handle_ || !smcore.filesystem->IsOk(handle_); } - bool Flush() KE_OVERRIDE { + bool Flush() override { smcore.filesystem->Flush(handle_); return true; } - bool EndOfFile() KE_OVERRIDE { + bool EndOfFile() override { return smcore.filesystem->EndOfFile(handle_); } - void Close() KE_OVERRIDE { + void Close() override { if (!handle_) return; smcore.filesystem->Close(handle_); @@ -180,31 +180,31 @@ public: return unlink(path) == 0; } - size_t Read(void *pOut, int size) KE_OVERRIDE { + size_t Read(void *pOut, int size) override { return fread(pOut, 1, size, fp_); } - char *ReadLine(char *pOut, int size) KE_OVERRIDE { + char *ReadLine(char *pOut, int size) override { return fgets(pOut, size, fp_); } - size_t Write(const void *pData, int size) KE_OVERRIDE { + size_t Write(const void *pData, int size) override { return fwrite(pData, 1, size, fp_); } - bool Seek(int pos, int seek_type) KE_OVERRIDE { + bool Seek(int pos, int seek_type) override { return fseek(fp_, pos, seek_type) == 0; } - int Tell() KE_OVERRIDE { + int Tell() override { return ftell(fp_); } - bool HasError() KE_OVERRIDE { + bool HasError() override { return ferror(fp_) != 0; } - bool Flush() KE_OVERRIDE { + bool Flush() override { return fflush(fp_) == 0; } - bool EndOfFile() KE_OVERRIDE { + bool EndOfFile() override { return feof(fp_) != 0; } - void Close() KE_OVERRIDE { + void Close() override { if (!fp_) return; fclose(fp_); diff --git a/core/vprof_tool.h b/core/vprof_tool.h index fc15aafa..9a31b381 100644 --- a/core/vprof_tool.h +++ b/core/vprof_tool.h @@ -40,19 +40,19 @@ public: VProfTool(); // IProfilingTool - const char *Name() KE_OVERRIDE; - const char *Description() KE_OVERRIDE; - bool Start() KE_OVERRIDE; - void Stop(void (*render)(const char *fmt, ...)) KE_OVERRIDE; - void Dump() KE_OVERRIDE; - bool IsActive() KE_OVERRIDE; - bool IsAttached() KE_OVERRIDE; - void EnterScope(const char *group, const char *name) KE_OVERRIDE; - void LeaveScope() KE_OVERRIDE; - void RenderHelp(void (*render)(const char *fmt, ...)) KE_OVERRIDE; + const char *Name() override; + const char *Description() override; + bool Start() override; + void Stop(void (*render)(const char *fmt, ...)) override; + void Dump() override; + bool IsActive() override; + bool IsAttached() override; + void EnterScope(const char *group, const char *name) override; + void LeaveScope() override; + void RenderHelp(void (*render)(const char *fmt, ...)) override; // SMGlobalClass - void OnSourceModAllInitialized() KE_OVERRIDE; + void OnSourceModAllInitialized() override; private: bool active_; diff --git a/public/amtl b/public/amtl index 448a1bf2..940aa2ff 160000 --- a/public/amtl +++ b/public/amtl @@ -1 +1 @@ -Subproject commit 448a1bf2123b4ed8489ef883326963165cb99c36 +Subproject commit 940aa2ff339d0a4a007af534636c3a2f38560c98 diff --git a/sourcepawn b/sourcepawn index f5fd57fb..5277a645 160000 --- a/sourcepawn +++ b/sourcepawn @@ -1 +1 @@ -Subproject commit f5fd57fb7fb1e0d5d8de3ae1979d6085fb390bf1 +Subproject commit 5277a645c185e39053ab0c27283fda968ed103a9