Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #268 from Arkshine/fix/handle-name-conflict

Browse Source 
Rename Handle class to avoid name collision in mac
This commit is contained in:
Vincent Herbet 2015-07-21 00:23:13 +02:00
commit 2162059352
13 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amxmodx/CDataPack.h
View File

@ -175,7 +175,7 @@ private:
}; };
}; };
extern Handle<CDataPack> DataPackHandles; extern NativeHandle<CDataPack> DataPackHandles;
extern AMX_NATIVE_INFO g_DatapackNatives[]; extern AMX_NATIVE_INFO g_DatapackNatives[];
#endif //_INCLUDE_SOURCEMOD_CDATAPACK_H_ #endif //_INCLUDE_SOURCEMOD_CDATAPACK_H_

2
amxmodx/CEvent.cpp
View File

@ -14,7 +14,7 @@
// class ClEvent // class ClEvent
// ***************************************************** // *****************************************************
Handle<EventHook> EventHandles; NativeHandle<EventHook> EventHandles;
EventsMngr::ClEvent::ClEvent(CPluginMngr::CPlugin* plugin, int func, int flags) EventsMngr::ClEvent::ClEvent(CPluginMngr::CPlugin* plugin, int func, int flags)
{ {

2
amxmodx/CEvent.h
View File

@ -158,6 +158,6 @@ struct EventHook
EventsMngr::ClEvent *m_event; EventsMngr::ClEvent *m_event;
}; };
extern Handle<EventHook> EventHandles; extern NativeHandle<EventHook> EventHandles;
#endif //__CEVENTS_H__ #endif //__CEVENTS_H__

2
amxmodx/datapacks.cpp
View File

@ -29,7 +29,7 @@
#include "CDataPack.h" #include "CDataPack.h"
Handle<CDataPack> DataPackHandles; NativeHandle<CDataPack> DataPackHandles;
static cell AMX_NATIVE_CALL CreateDataPack(AMX* amx, cell* params) static cell AMX_NATIVE_CALL CreateDataPack(AMX* amx, cell* params)
{ {

2
amxmodx/datastructs.cpp
View File

@ -11,7 +11,7 @@
#include "datastructs.h" #include "datastructs.h"
#include <am-utility.h> #include <am-utility.h>
Handle<CellArray> ArrayHandles; NativeHandle<CellArray> ArrayHandles;
// Array:ArrayCreate(cellsize=1, reserved=32); // Array:ArrayCreate(cellsize=1, reserved=32);
static cell AMX_NATIVE_CALL ArrayCreate(AMX* amx, cell* params) static cell AMX_NATIVE_CALL ArrayCreate(AMX* amx, cell* params)

2
amxmodx/datastructs.h
View File

@ -185,6 +185,6 @@ private:
size_t m_Size; size_t m_Size;
}; };
extern Handle<CellArray> ArrayHandles; extern NativeHandle<CellArray> ArrayHandles;
#endif #endif

2
amxmodx/gameconfigs.cpp
View File

@ -11,7 +11,7 @@
#include "amxmodx.h" #include "amxmodx.h"
#include "CGameConfigs.h" #include "CGameConfigs.h"
Handle<GameConfigNative> GameConfigHandle; NativeHandle<GameConfigNative> GameConfigHandle;
// native GameConfig:LoadGameConfigFile(const file[]); // native GameConfig:LoadGameConfigFile(const file[]);
static cell AMX_NATIVE_CALL LoadGameConfigFile(AMX *amx, cell *params) static cell AMX_NATIVE_CALL LoadGameConfigFile(AMX *amx, cell *params)

2
amxmodx/gameconfigs.h
View File

@ -15,4 +15,4 @@ struct GameConfigNative
IGameConfig *m_config; IGameConfig *m_config;
}; };
extern Handle<GameConfigNative> GameConfigHandle; extern NativeHandle<GameConfigNative> GameConfigHandle;

12
amxmodx/natives_handles.h
View File

@ -7,8 +7,8 @@
// Additional exceptions apply. For full license details, see LICENSE.txt or visit: // Additional exceptions apply. For full license details, see LICENSE.txt or visit:
// https://alliedmods.net/amxmodx-license // https://alliedmods.net/amxmodx-license
#ifndef _NATIVES_HANDLES_H_ #ifndef _NATIVES_NATIVES_HANDLES_H_
#define _NATIVES_HANDLES_H_ #define _NATIVES_NATIVES_HANDLES_H_
#include <am-vector.h> #include <am-vector.h>
@ -18,7 +18,7 @@
// on accident. // on accident.
template <typename T> template <typename T>
class Handle class NativeHandle
{ {
private: private:
@ -26,8 +26,8 @@ class Handle
public: public:
Handle() {} NativeHandle() {}
~Handle() ~NativeHandle()
{ {
this->clear(); this->clear();
} }
@ -113,4 +113,4 @@ class Handle
} }
}; };
#endif // _NATIVE_HANDLES_H_ #endif // _NATIVES_NATIVES_HANDLES_H_

2
amxmodx/textparse.cpp
View File

@ -11,7 +11,7 @@
#include "textparse.h" #include "textparse.h"
Handle<ParseInfo> TextParsersHandles; NativeHandle<ParseInfo> TextParsersHandles;
cell createParser() cell createParser()
{ {

2
amxmodx/textparse.h
View File

@ -132,6 +132,6 @@ public:
int handle; int handle;
}; };
extern Handle<ParseInfo> TextParsersHandles; extern NativeHandle<ParseInfo> TextParsersHandles;
#endif // _INCLUDE_TEXTPARSE_H_ #endif // _INCLUDE_TEXTPARSE_H_

4
amxmodx/trie_natives.cpp
View File

@ -9,8 +9,8 @@
#include "trie_natives.h" #include "trie_natives.h"
Handle<CellTrie> TrieHandles; NativeHandle<CellTrie> TrieHandles;
Handle<TrieSnapshot> TrieSnapshotHandles; NativeHandle<TrieSnapshot> TrieSnapshotHandles;
// native Trie:TrieCreate(); // native Trie:TrieCreate();
static cell AMX_NATIVE_CALL TrieCreate(AMX *amx, cell *params) static cell AMX_NATIVE_CALL TrieCreate(AMX *amx, cell *params)

4
amxmodx/trie_natives.h
View File

@ -159,8 +159,8 @@ struct TrieSnapshot
BaseStringTable strings; BaseStringTable strings;
}; };
extern Handle<CellTrie> TrieHandles; extern NativeHandle<CellTrie> TrieHandles;
extern Handle<TrieSnapshot> TrieSnapshotHandles; extern NativeHandle<TrieSnapshot> TrieSnapshotHandles;
extern AMX_NATIVE_INFO trie_Natives[]; extern AMX_NATIVE_INFO trie_Natives[];
#endif #endif