Skip to content

Commit

Permalink
Remove DLL_Pure type alias.
Browse files Browse the repository at this point in the history
  • Loading branch information
nitrocaster committed Nov 12, 2015
1 parent 676b645 commit c955da6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 2 additions & 4 deletions src/xrEngine/EngineAPI.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ class IFactoryObject
inline IFactoryObject::~IFactoryObject() {}
inline IFactoryObject *IFactoryObject::_construct() { return this; }

using DLL_Pure = IFactoryObject;

class ENGINE_API FactoryObjectBase : public IFactoryObject
{
public:
Expand All @@ -36,8 +34,8 @@ class ENGINE_API FactoryObjectBase : public IFactoryObject

// Class creation/destroying interface
extern "C" {
typedef DLL_API DLL_Pure* __cdecl Factory_Create(CLASS_ID CLS_ID);
typedef DLL_API void __cdecl Factory_Destroy(DLL_Pure* O);
typedef DLL_API IFactoryObject* __cdecl Factory_Create(CLASS_ID CLS_ID);
typedef DLL_API void __cdecl Factory_Destroy(IFactoryObject* O);
};

// Tuning interface
Expand Down
4 changes: 2 additions & 2 deletions src/xrServerEntities/object_factory_space.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ class CSE_Abstract;
namespace ObjectFactory {

#ifndef NO_XR_GAME
typedef DLL_Pure CLIENT_BASE_CLASS;
typedef IFactoryObject CLIENT_BASE_CLASS;
#endif
typedef CSE_Abstract SERVER_BASE_CLASS;

#ifndef NO_XR_GAME
typedef DLL_Pure CLIENT_SCRIPT_BASE_CLASS;
typedef IFactoryObject CLIENT_SCRIPT_BASE_CLASS;
#endif
typedef CSE_Abstract SERVER_SCRIPT_BASE_CLASS;
};
Expand Down

0 comments on commit c955da6

Please sign in to comment.