Skip to content

Commit

Permalink
Remove xr_new templates.
Browse files Browse the repository at this point in the history
  • Loading branch information
nitrocaster committed Jan 31, 2016
1 parent 8dfdc4d commit c0926af
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 193 deletions.
49 changes: 0 additions & 49 deletions src/xrCore/xrMemory_subst_borland.h
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,4 @@
// new(0)
template <class T>
IC T* xr_new()
{
return new T();
}
// new(1)
template <class T, class P1>
IC T* xr_new(P1 p1)
{
return new T(p1);
}
// new(2)
template <class T, class P1, class P2>
IC T* xr_new(P1 p1, P2 p2)
{
return new T(p1, p2);
}
// new(3)
template <class T, class P1, class P2, class P3>
IC T* xr_new(P1 p1, P2 p2, P3 p3)
{
return new T(p1, p2, p3);
}
// new(4)
template <class T, class P1, class P2, class P3, class P4>
IC T* xr_new(P1 p1, P2 p2, P3 p3, P4 p4)
{
return new T(p1, p2, p3, p4);
}
// new(5)
template <class T, class P1, class P2, class P3, class P4, class P5>
IC T* xr_new(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5)
{
return new T(p1, p2, p3, p4, p5);
}
// new(6)
template <class T, class P1, class P2, class P3, class P4, class P5, class P6>
IC T* xr_new(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6)
{
return new T(p1, p2, p3, p4, p5, p6);
}
// new(7)
template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7>
IC T* xr_new(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7)
{
return new T(p1, p2, p3, p4, p5, p6, p7);
}

// #define xr_delete(ptr) if (ptr){delete ptr; ptr=0;}
template <class T>
IC void xr_delete(T*& ptr)
{
Expand Down
144 changes: 0 additions & 144 deletions src/xrCore/xrMemory_subst_msvc.h
View file
Original file line number Diff line number Diff line change
@@ -1,147 +1,3 @@
#ifdef DEBUG_MEMORY_NAME
// new(0)
template <class T>
IC T* xr_new()
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T), typeid(T).name());
return new (ptr)T();
}
// new(1)
template <class T, class P1>
IC T* xr_new(const P1& p1)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T), typeid(T).name());
return new (ptr)T(p1);
}
// new(2)
template <class T, class P1, class P2>
IC T* xr_new(const P1& p1, const P2& p2)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T), typeid(T).name());
return new (ptr)T(p1, p2);
}
// new(3)
template <class T, class P1, class P2, class P3>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T), typeid(T).name());
return new (ptr)T(p1, p2, p3);
}
// new(4)
template <class T, class P1, class P2, class P3, class P4>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3, const P4& p4)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T), typeid(T).name());
return new (ptr)T(p1, p2, p3, p4);
}
// new(5)
template <class T, class P1, class P2, class P3, class P4, class P5>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3, const P4& p4, const P5& p5)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T), typeid(T).name());
return new (ptr)T(p1, p2, p3, p4, p5);
}
// new(6)
template <class T, class P1, class P2, class P3, class P4, class P5, class P6>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3, const P4& p4, const P5& p5, const P6& p6)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T), typeid(T).name());
return new (ptr)T(p1, p2, p3, p4, p5, p6);
}
// new(7)
template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3, const P4& p4, const P5& p5, const P6& p6, const P7& p7)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T), typeid(T).name());
return new (ptr)T(p1, p2, p3, p4, p5, p6, p7);
}
// new(8)
template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3, const P4& p4, const P5& p5, const P6& p6, const P7& p7, const P8& p8)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T), typeid(T).name());
return new (ptr)T(p1, p2, p3, p4, p5, p6, p7, p8);
}
// new(9)
template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3, const P4& p4, const P5& p5, const P6& p6, const P7& p7, const P8& p8, const P8& p9)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T), typeid(T).name());
return new (ptr)T(p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
#else // DEBUG_MEMORY_NAME
// new(0)
template <class T>
IC T* xr_new()
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T));
return new (ptr)T();
}
// new(1)
template <class T, class P1>
IC T* xr_new(const P1& p1)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T));
return new (ptr)T(p1);
}
// new(2)
template <class T, class P1, class P2>
IC T* xr_new(const P1& p1, const P2& p2)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T));
return new (ptr)T(p1, p2);
}
// new(3)
template <class T, class P1, class P2, class P3>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T));
return new (ptr)T(p1, p2, p3);
}
// new(4)
template <class T, class P1, class P2, class P3, class P4>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3, const P4& p4)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T));
return new (ptr)T(p1, p2, p3, p4);
}
// new(5)
template <class T, class P1, class P2, class P3, class P4, class P5>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3, const P4& p4, const P5& p5)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T));
return new (ptr)T(p1, p2, p3, p4, p5);
}
// new(6)
template <class T, class P1, class P2, class P3, class P4, class P5, class P6>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3, const P4& p4, const P5& p5, const P6& p6)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T));
return new (ptr)T(p1, p2, p3, p4, p5, p6);
}
// new(7)
template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3, const P4& p4, const P5& p5, const P6& p6, const P7& p7)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T));
return new (ptr)T(p1, p2, p3, p4, p5, p6, p7);
}
// new(8)
template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3, const P4& p4, const P5& p5, const P6& p6, const P7& p7, const P8& p8)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T));
return new (ptr)T(p1, p2, p3, p4, p5, p6, p7, p8);
}
// new(9)
template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9>
IC T* xr_new(const P1& p1, const P2& p2, const P3& p3, const P4& p4, const P5& p5, const P6& p6, const P7& p7, const P8& p8, const P8& p9)
{
T* ptr = (T*)Memory.mem_alloc(sizeof(T));
return new (ptr)T(p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
#endif // DEBUG_MEMORY_NAME

template <bool _is_pm, typename T>
struct xr_special_free
{
Expand Down

0 comments on commit c0926af

Please sign in to comment.