UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #383 from alliedmodders/new-amtl

Browse Source 
Update to the latest AMTL version.
This commit is contained in:
David Anderson 2015-08-27 10:55:00 -04:00
commit 2d40af31a2
7 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/MenuStyle_Base.h
View File

@ -71,8 +71,8 @@ public:
unsigned int access; unsigned int access;
private: private:
CItem(const CItem &other) KE_DELETE; CItem(const CItem &other) = delete;
CItem &operator =(const CItem &other) KE_DELETE; CItem &operator =(const CItem &other) = delete;
}; };
class CBaseMenuPlayer class CBaseMenuPlayer

6
core/logic/ProfileTools.h
View File

@ -44,11 +44,11 @@ public:
ProfileToolManager(); ProfileToolManager();
// SMGlobalClass // SMGlobalClass
void OnSourceModAllInitialized() KE_OVERRIDE; void OnSourceModAllInitialized() override;
void OnSourceModShutdown() KE_OVERRIDE; void OnSourceModShutdown() override;
// IRootConsoleCommand // IRootConsoleCommand
void OnRootConsoleCommand2(const char *cmdname, const ICommandArgs *args) KE_OVERRIDE; void OnRootConsoleCommand2(const char *cmdname, const ICommandArgs *args) override;
void RegisterTool(IProfilingTool *tool) { void RegisterTool(IProfilingTool *tool) {
tools_.append(tool); tools_.append(tool);

2
core/logic/smn_adt_trie.cpp
View File

@ -121,7 +121,7 @@ public:
} }
private: private:
Entry(const Entry &other) KE_DELETE; Entry(const Entry &other) = delete;
ArrayInfo *ensureArray(size_t bytes) { ArrayInfo *ensureArray(size_t bytes) {
ArrayInfo *array = raw(); ArrayInfo *array = raw();

36
core/logic/smn_filesystem.cpp
View File

@ -116,33 +116,33 @@ public:
return true; 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_); 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_); 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_); 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); smcore.filesystem->Seek(handle_, pos, seek_type);
return !HasError(); return !HasError();
} }
int Tell() KE_OVERRIDE { int Tell() override {
return smcore.filesystem->Tell(handle_); return smcore.filesystem->Tell(handle_);
} }
bool HasError() KE_OVERRIDE { bool HasError() override {
return !handle_ || !smcore.filesystem->IsOk(handle_); return !handle_ || !smcore.filesystem->IsOk(handle_);
} }
bool Flush() KE_OVERRIDE { bool Flush() override {
smcore.filesystem->Flush(handle_); smcore.filesystem->Flush(handle_);
return true; return true;
} }
bool EndOfFile() KE_OVERRIDE { bool EndOfFile() override {
return smcore.filesystem->EndOfFile(handle_); return smcore.filesystem->EndOfFile(handle_);
} }
void Close() KE_OVERRIDE { void Close() override {
if (!handle_) if (!handle_)
return; return;
smcore.filesystem->Close(handle_); smcore.filesystem->Close(handle_);
@ -180,31 +180,31 @@ public:
return unlink(path) == 0; 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_); 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_); 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_); 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; return fseek(fp_, pos, seek_type) == 0;
} }
int Tell() KE_OVERRIDE { int Tell() override {
return ftell(fp_); return ftell(fp_);
} }
bool HasError() KE_OVERRIDE { bool HasError() override {
return ferror(fp_) != 0; return ferror(fp_) != 0;
} }
bool Flush() KE_OVERRIDE { bool Flush() override {
return fflush(fp_) == 0; return fflush(fp_) == 0;
} }
bool EndOfFile() KE_OVERRIDE { bool EndOfFile() override {
return feof(fp_) != 0; return feof(fp_) != 0;
} }
void Close() KE_OVERRIDE { void Close() override {
if (!fp_) if (!fp_)
return; return;
fclose(fp_); fclose(fp_);

22
core/vprof_tool.h
View File

@ -40,19 +40,19 @@ public:
VProfTool(); VProfTool();
// IProfilingTool // IProfilingTool
const char *Name() KE_OVERRIDE; const char *Name() override;
const char *Description() KE_OVERRIDE; const char *Description() override;
bool Start() KE_OVERRIDE; bool Start() override;
void Stop(void (*render)(const char *fmt, ...)) KE_OVERRIDE; void Stop(void (*render)(const char *fmt, ...)) override;
void Dump() KE_OVERRIDE; void Dump() override;
bool IsActive() KE_OVERRIDE; bool IsActive() override;
bool IsAttached() KE_OVERRIDE; bool IsAttached() override;
void EnterScope(const char *group, const char *name) KE_OVERRIDE; void EnterScope(const char *group, const char *name) override;
void LeaveScope() KE_OVERRIDE; void LeaveScope() override;
void RenderHelp(void (*render)(const char *fmt, ...)) KE_OVERRIDE; void RenderHelp(void (*render)(const char *fmt, ...)) override;
// SMGlobalClass // SMGlobalClass
void OnSourceModAllInitialized() KE_OVERRIDE; void OnSourceModAllInitialized() override;
private: private:
bool active_; bool active_;

2
public/amtl

@ -1 +1 @@
Subproject commit 448a1bf2123b4ed8489ef883326963165cb99c36 Subproject commit 940aa2ff339d0a4a007af534636c3a2f38560c98

2
sourcepawn

@ -1 +1 @@
Subproject commit f5fd57fb7fb1e0d5d8de3ae1979d6085fb390bf1 Subproject commit 5277a645c185e39053ab0c27283fda968ed103a9