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

Update to the latest AMTL - Rename Ref to RefPtr.

Browse Source
This commit is contained in:
David Anderson 2015-11-08 13:14:57 -08:00
parent ce25a44e00
commit e2b399b8d3
21 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ChatTriggers.h
View File

@ -68,7 +68,7 @@ private:
bool ClientIsFlooding(int client); bool ClientIsFlooding(int client);
cell_t CallOnClientSayCommand(int client); cell_t CallOnClientSayCommand(int client);
private: private:
ke::Vector<ke::Ref<CommandHook>> hooks_; ke::Vector<ke::RefPtr<CommandHook>> hooks_;
ke::AString m_PubTrigger; ke::AString m_PubTrigger;
ke::AString m_PrivTrigger; ke::AString m_PrivTrigger;
bool m_bWillProcessInPost; bool m_bWillProcessInPost;

4
core/ConCmdManager.cpp
View File

@ -356,7 +356,7 @@ bool ConCmdManager::AddAdminCommand(IPluginFunction *pFunction,
return false; return false;
i->value = new CommandGroup(); i->value = new CommandGroup();
} }
Ref<CommandGroup> cmdgroup = i->value; RefPtr<CommandGroup> cmdgroup = i->value;
CmdHook *pHook = new CmdHook(CmdHook::Client, pInfo, pFunction, description); CmdHook *pHook = new CmdHook(CmdHook::Client, pInfo, pFunction, description);
pHook->admin = new AdminCmdInfo(cmdgroup, adminflags); pHook->admin = new AdminCmdInfo(cmdgroup, adminflags);
@ -488,7 +488,7 @@ void ConCmdManager::UpdateAdminCmdFlags(const char *cmd, OverrideType type, Flag
if (!r.found()) if (!r.found())
return; return;
Ref<CommandGroup> group(r->value); RefPtr<CommandGroup> group(r->value);
for (PluginHookList::iterator iter = group->hooks.begin(); iter != group->hooks.end(); iter++) for (PluginHookList::iterator iter = group->hooks.begin(); iter != group->hooks.end(); iter++)
{ {

8
core/ConCmdManager.h
View File

@ -59,13 +59,13 @@ struct CommandGroup : public ke::Refcounted<CommandGroup>
struct AdminCmdInfo struct AdminCmdInfo
{ {
AdminCmdInfo(const ke::Ref<CommandGroup> &group, FlagBits flags) AdminCmdInfo(const ke::RefPtr<CommandGroup> &group, FlagBits flags)
: group(group), : group(group),
flags(flags), flags(flags),
eflags(0) eflags(0)
{ {
} }
ke::Ref<CommandGroup> group; ke::RefPtr<CommandGroup> group;
FlagBits flags; /* default flags */ FlagBits flags; /* default flags */
FlagBits eflags; /* effective flags */ FlagBits eflags; /* effective flags */
}; };
@ -106,7 +106,7 @@ struct ConCmdInfo
ConCommand *pCmd; /**< Pointer to the command itself */ ConCommand *pCmd; /**< Pointer to the command itself */
CmdHookList hooks; /**< Hook list */ CmdHookList hooks; /**< Hook list */
FlagBits eflags; /**< Effective admin flags */ FlagBits eflags; /**< Effective admin flags */
ke::Ref<CommandHook> sh_hook; /**< SourceHook hook, if any. */ ke::RefPtr<CommandHook> sh_hook; /**< SourceHook hook, if any. */
}; };
typedef List<ConCmdInfo *> ConCmdList; typedef List<ConCmdInfo *> ConCmdList;
@ -161,7 +161,7 @@ public:
return m_CmdList; return m_CmdList;
} }
private: private:
typedef StringHashMap<ke::Ref<CommandGroup> > GroupMap; typedef StringHashMap<ke::RefPtr<CommandGroup> > GroupMap;
StringHashMap<ConCmdInfo *> m_Cmds; /* command lookup */ StringHashMap<ConCmdInfo *> m_Cmds; /* command lookup */
GroupMap m_CmdGrps; /* command group map */ GroupMap m_CmdGrps; /* command group map */

4
core/HalfLife2.cpp
View File

@ -226,7 +226,7 @@ void CHalfLife2::InitCommandLine()
#if SOURCE_ENGINE != SE_DARKMESSIAH #if SOURCE_ENGINE != SE_DARKMESSIAH
if (g_SMAPI->GetSourceEngineBuild() != SOURCE_ENGINE_ORIGINAL) if (g_SMAPI->GetSourceEngineBuild() != SOURCE_ENGINE_ORIGINAL)
{ {
ke::Ref<ke::SharedLib> lib = ke::SharedLib::Open(TIER0_NAME, error, sizeof(error)); ke::RefPtr<ke::SharedLib> lib = ke::SharedLib::Open(TIER0_NAME, error, sizeof(error));
if (!lib) { if (!lib) {
logger->LogError("Could not load %s: %s", TIER0_NAME, error); logger->LogError("Could not load %s: %s", TIER0_NAME, error);
return; return;
@ -243,7 +243,7 @@ void CHalfLife2::InitCommandLine()
else else
#endif #endif
{ {
ke::Ref<ke::SharedLib> lib = ke::SharedLib::Open(VSTDLIB_NAME, error, sizeof(error)); ke::RefPtr<ke::SharedLib> lib = ke::SharedLib::Open(VSTDLIB_NAME, error, sizeof(error));
if (!lib) { if (!lib) {
logger->LogError("Could not load %s: %s", VSTDLIB_NAME, error); logger->LogError("Could not load %s: %s", VSTDLIB_NAME, error);
return; return;

4
core/logic/LibrarySys.cpp
View File

@ -41,7 +41,7 @@
LibrarySystem g_LibSys; LibrarySystem g_LibSys;
CLibrary::CLibrary(ke::Ref<ke::SharedLib> lib) CLibrary::CLibrary(ke::RefPtr<ke::SharedLib> lib)
: lib_(lib) : lib_(lib)
{ {
} }
@ -241,7 +241,7 @@ void LibrarySystem::CloseDirectory(IDirectory *dir)
ILibrary *LibrarySystem::OpenLibrary(const char *path, char *error, size_t maxlength) ILibrary *LibrarySystem::OpenLibrary(const char *path, char *error, size_t maxlength)
{ {
ke::Ref<ke::SharedLib> lib = ke::SharedLib::Open(path, error, maxlength); ke::RefPtr<ke::SharedLib> lib = ke::SharedLib::Open(path, error, maxlength);
if (!lib) if (!lib)
return nullptr; return nullptr;
return new CLibrary(lib); return new CLibrary(lib);

4
core/logic/LibrarySys.h
View File

@ -66,12 +66,12 @@ private:
class CLibrary : public ILibrary class CLibrary : public ILibrary
{ {
public: public:
CLibrary(ke::Ref<ke::SharedLib> lib); CLibrary(ke::RefPtr<ke::SharedLib> lib);
public: public:
void CloseLibrary() override; void CloseLibrary() override;
void *GetSymbolAddress(const char *symname) override; void *GetSymbolAddress(const char *symname) override;
private: private:
ke::Ref<ke::SharedLib> lib_; ke::RefPtr<ke::SharedLib> lib_;
}; };
class LibrarySystem : public ILibrarySys class LibrarySystem : public ILibrarySys

2
core/logic/Native.h
View File

@ -89,7 +89,7 @@ struct Native : public ke::Refcounted<Native>
return fake->name.chars(); return fake->name.chars();
} }
static inline bool matches(const char *name, const ke::Ref<Native> &entry) static inline bool matches(const char *name, const ke::RefPtr<Native> &entry)
{ {
return strcmp(name, entry->name()) == 0; return strcmp(name, entry->name()) == 0;
} }

2
core/logic/NativeOwner.h
View File

@ -81,7 +81,7 @@ protected:
unsigned int m_nMarkSerial; unsigned int m_nMarkSerial;
List<WeakNative> m_WeakRefs; List<WeakNative> m_WeakRefs;
ke::Vector<const sp_nativeinfo_t *> m_natives; ke::Vector<const sp_nativeinfo_t *> m_natives;
ke::Vector<ke::Ref<Native> > m_fakes; ke::Vector<ke::RefPtr<Native> > m_fakes;
}; };
extern CNativeOwner g_CoreNatives; extern CNativeOwner g_CoreNatives;

10
core/logic/PluginSys.cpp
View File

@ -676,7 +676,7 @@ void CPlugin::DependencyDropped(CPlugin *pOwner)
unsigned int unbound = 0; unsigned int unbound = 0;
for (size_t i = 0; i < pOwner->m_fakes.length(); i++) for (size_t i = 0; i < pOwner->m_fakes.length(); i++)
{ {
ke::Ref<Native> entry(pOwner->m_fakes[i]); ke::RefPtr<Native> entry(pOwner->m_fakes[i]);
uint32_t idx; uint32_t idx;
if (m_pRuntime->FindNativeByName(entry->name(), &idx) != SP_ERROR_NONE) if (m_pRuntime->FindNativeByName(entry->name(), &idx) != SP_ERROR_NONE)
@ -769,7 +769,7 @@ void CPlugin::DropEverything()
bool CPlugin::AddFakeNative(IPluginFunction *pFunc, const char *name, SPVM_FAKENATIVE_FUNC func) bool CPlugin::AddFakeNative(IPluginFunction *pFunc, const char *name, SPVM_FAKENATIVE_FUNC func)
{ {
ke::Ref<Native> entry = g_ShareSys.AddFakeNative(pFunc, name, func); ke::RefPtr<Native> entry = g_ShareSys.AddFakeNative(pFunc, name, func);
if (!entry) if (!entry)
return false; return false;
@ -2319,7 +2319,7 @@ public:
void AddPluginsListener_V1(IPluginsListener_V1 *listener) override void AddPluginsListener_V1(IPluginsListener_V1 *listener) override
{ {
ke::Ref<PluginsListenerV1Wrapper> wrapper = new PluginsListenerV1Wrapper(listener); ke::RefPtr<PluginsListenerV1Wrapper> wrapper = new PluginsListenerV1Wrapper(listener);
v1_wrappers_.append(wrapper); v1_wrappers_.append(wrapper);
g_PluginSys.AddPluginsListener(wrapper); g_PluginSys.AddPluginsListener(wrapper);
@ -2327,7 +2327,7 @@ public:
void RemovePluginsListener_V1(IPluginsListener_V1 *listener) override void RemovePluginsListener_V1(IPluginsListener_V1 *listener) override
{ {
ke::Ref<PluginsListenerV1Wrapper> wrapper; ke::RefPtr<PluginsListenerV1Wrapper> wrapper;
// Find which wrapper has this listener. // Find which wrapper has this listener.
for (decltype(v1_wrappers_)::iterator iter(v1_wrappers_); !iter.done(); iter.next()) { for (decltype(v1_wrappers_)::iterator iter(v1_wrappers_); !iter.done(); iter.next()) {
@ -2356,7 +2356,7 @@ public:
} }
private: private:
ReentrantList<ke::Ref<PluginsListenerV1Wrapper>> v1_wrappers_; ReentrantList<ke::RefPtr<PluginsListenerV1Wrapper>> v1_wrappers_;
}; };
static OldPluginAPI sOldPluginAPI; static OldPluginAPI sOldPluginAPI;

14
core/logic/ShareSys.cpp
View File

@ -292,7 +292,7 @@ void ShareSystem::BindNativesToPlugin(CPlugin *pPlugin, bool bCoreOnly)
continue; continue;
/* Otherwise, the native must be in our cache. */ /* Otherwise, the native must be in our cache. */
Ref<Native> pEntry = FindNative(native->name); RefPtr<Native> pEntry = FindNative(native->name);
if (!pEntry) if (!pEntry)
continue; continue;
@ -303,7 +303,7 @@ void ShareSystem::BindNativesToPlugin(CPlugin *pPlugin, bool bCoreOnly)
} }
} }
void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, const Ref<Native> &entry) void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, const RefPtr<Native> &entry)
{ {
if (!entry->owner) if (!entry->owner)
return; return;
@ -325,7 +325,7 @@ void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, const Ref<Native> &entry)
} }
void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, const sp_native_t *native, uint32_t index, void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, const sp_native_t *native, uint32_t index,
const Ref<Native> &pEntry) const RefPtr<Native> &pEntry)
{ {
uint32_t flags = 0; uint32_t flags = 0;
if (pEntry->fake) if (pEntry->fake)
@ -374,7 +374,7 @@ PassRef<Native> ShareSystem::AddNativeToCache(CNativeOwner *pOwner, const sp_nat
if (i.found()) if (i.found())
return NULL; return NULL;
Ref<Native> entry = new Native(pOwner, ntv); RefPtr<Native> entry = new Native(pOwner, ntv);
m_NtvCache.insert(ntv->name, entry); m_NtvCache.insert(ntv->name, entry);
return entry; return entry;
} }
@ -390,7 +390,7 @@ void ShareSystem::ClearNativeFromCache(CNativeOwner *pOwner, const char *name)
if (!r.found()) if (!r.found())
return; return;
Ref<Native> entry(*r); RefPtr<Native> entry(*r);
if (entry->owner != pOwner) if (entry->owner != pOwner)
return; return;
@ -402,7 +402,7 @@ void ShareSystem::ClearNativeFromCache(CNativeOwner *pOwner, const char *name)
PassRef<Native> ShareSystem::AddFakeNative(IPluginFunction *pFunc, const char *name, SPVM_FAKENATIVE_FUNC func) PassRef<Native> ShareSystem::AddFakeNative(IPluginFunction *pFunc, const char *name, SPVM_FAKENATIVE_FUNC func)
{ {
Ref<Native> entry(FindNative(name)); RefPtr<Native> entry(FindNative(name));
if (entry) if (entry)
return NULL; return NULL;
@ -475,7 +475,7 @@ FeatureStatus ShareSystem::TestNative(IPluginRuntime *pRuntime, const char *name
} }
} }
Ref<Native> entry = FindNative(name); RefPtr<Native> entry = FindNative(name);
if (!entry) if (!entry)
return FeatureStatus_Unknown; return FeatureStatus_Unknown;

6
core/logic/ShareSys.h
View File

@ -121,15 +121,15 @@ public:
public: public:
void BeginBindingFor(CPlugin *pPlugin); void BeginBindingFor(CPlugin *pPlugin);
void BindNativesToPlugin(CPlugin *pPlugin, bool bCoreOnly); void BindNativesToPlugin(CPlugin *pPlugin, bool bCoreOnly);
void BindNativeToPlugin(CPlugin *pPlugin, const ke::Ref<Native> &pEntry); void BindNativeToPlugin(CPlugin *pPlugin, const ke::RefPtr<Native> &pEntry);
ke::PassRef<Native> AddFakeNative(IPluginFunction *pFunc, const char *name, SPVM_FAKENATIVE_FUNC func); ke::PassRef<Native> AddFakeNative(IPluginFunction *pFunc, const char *name, SPVM_FAKENATIVE_FUNC func);
ke::PassRef<Native> FindNative(const char *name); ke::PassRef<Native> FindNative(const char *name);
private: private:
ke::PassRef<Native> AddNativeToCache(CNativeOwner *pOwner, const sp_nativeinfo_t *ntv); ke::PassRef<Native> AddNativeToCache(CNativeOwner *pOwner, const sp_nativeinfo_t *ntv);
void ClearNativeFromCache(CNativeOwner *pOwner, const char *name); void ClearNativeFromCache(CNativeOwner *pOwner, const char *name);
void BindNativeToPlugin(CPlugin *pPlugin, const sp_native_t *ntv, uint32_t index, const ke::Ref<Native> &pEntry); void BindNativeToPlugin(CPlugin *pPlugin, const sp_native_t *ntv, uint32_t index, const ke::RefPtr<Native> &pEntry);
private: private:
typedef NameHashSet<ke::Ref<Native>, Native> NativeCache; typedef NameHashSet<ke::RefPtr<Native>, Native> NativeCache;
List<IfaceInfo> m_Interfaces; List<IfaceInfo> m_Interfaces;
HandleType_t m_TypeRoot; HandleType_t m_TypeRoot;

2
core/logic/smn_database.cpp
View File

@ -1716,7 +1716,7 @@ public:
} }
private: private:
ke::Ref<IDatabase> db_; ke::RefPtr<IDatabase> db_;
Transaction *txn_; Transaction *txn_;
IdentityToken_t *ident_; IdentityToken_t *ident_;
IPluginFunction *success_; IPluginFunction *success_;

6
core/logic_bridge.cpp
View File

@ -689,7 +689,7 @@ void CoreProviderImpl::InitializeBridge()
MATCHMAKINGDS_SUFFIX, MATCHMAKINGDS_SUFFIX,
MATCHMAKINGDS_EXT); MATCHMAKINGDS_EXT);
if (ke::Ref<ke::SharedLib> mmlib = ke::SharedLib::Open(path, NULL, 0)) { if (ke::RefPtr<ke::SharedLib> mmlib = ke::SharedLib::Open(path, NULL, 0)) {
this->matchmakingDSFactory = this->matchmakingDSFactory =
mmlib->get<decltype(sCoreProviderImpl.matchmakingDSFactory)>("CreateInterface"); mmlib->get<decltype(sCoreProviderImpl.matchmakingDSFactory)>("CreateInterface");
} }
@ -789,9 +789,9 @@ CoreProviderImpl::DefineCommand(const char *name, const char *help, const Comman
}; };
ConCommand *cmd = new ConCommand(new_name, ignore_callback, new_help, flags); ConCommand *cmd = new ConCommand(new_name, ignore_callback, new_help, flags);
ke::Ref<CommandHook> hook = AddCommandHook(cmd, callback); ke::RefPtr<CommandHook> hook = AddCommandHook(cmd, callback);
ke::Ref<CommandImpl> impl = new CommandImpl(cmd, hook); ke::RefPtr<CommandImpl> impl = new CommandImpl(cmd, hook);
commands_.append(impl); commands_.append(impl);
} }

6
core/provider.h
View File

@ -75,7 +75,7 @@ public:
} }
private: private:
ke::Ref<ke::SharedLib> logic_; ke::RefPtr<ke::SharedLib> logic_;
LogicInitFunction logic_init_; LogicInitFunction logic_init_;
GameHooks hooks_; GameHooks hooks_;
@ -87,9 +87,9 @@ private:
private: private:
ConCommand *cmd_; ConCommand *cmd_;
ke::Ref<CommandHook> hook_; ke::RefPtr<CommandHook> hook_;
}; };
ke::Vector<ke::Ref<CommandImpl>> commands_; ke::Vector<ke::RefPtr<CommandImpl>> commands_;
}; };
extern CoreProviderImpl sCoreProviderImpl; extern CoreProviderImpl sCoreProviderImpl;

2
core/sourcemod.cpp
View File

@ -57,7 +57,7 @@ SH_DECL_HOOK1_void(IVEngineServer, ServerCommand, SH_NOATTRIB, false, const char
SourceModBase g_SourceMod; SourceModBase g_SourceMod;
ke::Ref<ke::SharedLib> g_JIT; ke::RefPtr<ke::SharedLib> g_JIT;
SourceHook::String g_BaseDir; SourceHook::String g_BaseDir;
ISourcePawnEngine *g_pSourcePawn = NULL; ISourcePawnEngine *g_pSourcePawn = NULL;
ISourcePawnEngine2 *g_pSourcePawn2 = NULL; ISourcePawnEngine2 *g_pSourcePawn2 = NULL;

2
extensions/clientprefs/extension.h
View File

@ -151,7 +151,7 @@ public:
IdentityToken_t *GetIdentity() const; IdentityToken_t *GetIdentity() const;
public: public:
IDBDriver *Driver; IDBDriver *Driver;
ke::Ref<IDatabase> Database; ke::RefPtr<IDatabase> Database;
IPhraseCollection *phrases; IPhraseCollection *phrases;
const DatabaseInfo *DBInfo; const DatabaseInfo *DBInfo;

2
extensions/mysql/mysql/MyBasicResults.h
View File

@ -91,7 +91,7 @@ public: // Used by the driver to implement GetInsertIDForQuery()/GetAffectedRows
unsigned int GetInsertID(); unsigned int GetInsertID();
unsigned int GetAffectedRows(); unsigned int GetAffectedRows();
private: private:
ke::Ref<MyDatabase> m_pParent; ke::RefPtr<MyDatabase> m_pParent;
MyBasicResults m_rs; MyBasicResults m_rs;
unsigned int m_InsertID; unsigned int m_InsertID;
unsigned int m_AffectedRows; unsigned int m_AffectedRows;

2
extensions/mysql/mysql/MyStatement.h
View File

@ -69,7 +69,7 @@ private:
void *CopyBlob(unsigned int param, const void *blobptr, size_t length); void *CopyBlob(unsigned int param, const void *blobptr, size_t length);
private: private:
MYSQL *m_mysql; MYSQL *m_mysql;
ke::Ref<MyDatabase> m_pParent; ke::RefPtr<MyDatabase> m_pParent;
MYSQL_STMT *m_stmt; MYSQL_STMT *m_stmt;
MYSQL_BIND *m_bind; MYSQL_BIND *m_bind;
MYSQL_RES *m_pRes; MYSQL_RES *m_pRes;

2
extensions/sqlite/driver/SqQuery.h
View File

@ -82,7 +82,7 @@ public: //IResultRow
public: public:
sqlite3_stmt *GetStmt(); sqlite3_stmt *GetStmt();
private: private:
ke::Ref<SqDatabase> m_pParent; ke::RefPtr<SqDatabase> m_pParent;
sqlite3_stmt *m_pStmt; sqlite3_stmt *m_pStmt;
SqResults *m_pResults; SqResults *m_pResults;
unsigned int m_ParamCount; unsigned int m_ParamCount;

2
public/amtl

@ -1 +1 @@
Subproject commit c35532ced5e7e4f882106857bfae8f3db0fbacf0 Subproject commit 50de9b831e1691cb513b6e18a49cdf5b4d73c5cb

2
sourcepawn

@ -1 +1 @@
Subproject commit 451affdd4e6f5f43381d53f0293df335930b64a4 Subproject commit 028d93357d452906aac2a5bbfb3284682b5b1173