Fixed Linux compiler errors

Source-Python-Dev-Team · Jun 20, 2020 · 3572be4 · 3572be4
1 parent b7b575a
commit 3572be4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/core/modules/entities/entities_datamaps.h b/src/core/modules/entities/entities_datamaps.h
@@ -90,7 +90,7 @@ class CInputFunction: public CFunction
 {
 public:
 	CInputFunction(typedescription_t pTypeDesc, CBaseEntity *pBaseEntity);
-	void CInputFunction::__call__(object value, CBaseEntity *pActivator, CBaseEntity *pCaller);
+	void __call__(object value, CBaseEntity *pActivator, CBaseEntity *pCaller);
 
 public:
 	typedescription_t m_pTypeDesc;

diff --git a/src/core/modules/entities/entities_entity.cpp b/src/core/modules/entities/entities_entity.cpp
@@ -85,7 +85,8 @@ object CBaseEntityWrapper::create(object cls, const char *name)
 	{
 		try
 		{
-			entity = MakeObject(cls, &pEntity->GetPointer());
+			CPointer tmp = pEntity->GetPointer();
+			entity = MakeObject(cls, &tmp);
 		}
 		catch (...)
 		{
@@ -128,7 +129,8 @@ object CBaseEntityWrapper::find(object cls, const char *name)
 		{
 			try
 			{
-				return MakeObject(cls, &pEntity->GetPointer());
+				CPointer tmp = pEntity->GetPointer();
+				return MakeObject(cls, &tmp);
 			}
 			catch (...)
 			{

diff --git a/src/core/modules/listeners/listeners_manager.h b/src/core/modules/listeners/listeners_manager.h
@@ -53,7 +53,7 @@
 	for(int i = 0; i < mngr->m_vecCallables.Count(); i++) \
 	{ \
 		BEGIN_BOOST_PY() \
-			mngr->m_vecCallables[i](##__VA_ARGS__); \
+			mngr->m_vecCallables[i]( #__VA_ARGS__ ); \
 		END_BOOST_PY_NORET() \
 	}
 
@@ -65,7 +65,7 @@
 	for(int i = 0; i < mngr->m_vecCallables.Count(); i++) \
 	{ \
 		BEGIN_BOOST_PY() \
-			return_var = mngr->m_vecCallables[i](##__VA_ARGS__); \
+			return_var = mngr->m_vecCallables[i]( #__VA_ARGS__ ); \
 			action \
 		END_BOOST_PY_NORET() \
 	}