From 959831f4ef5a3e797f576c3de08cd65032c997ad Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 13 Jan 2013 18:54:10 +1000 Subject: Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard. --- libraries/irrlicht-1.8/include/irrAllocator.h | 248 +++++++++++++------------- 1 file changed, 124 insertions(+), 124 deletions(-) (limited to 'libraries/irrlicht-1.8/include/irrAllocator.h') diff --git a/libraries/irrlicht-1.8/include/irrAllocator.h b/libraries/irrlicht-1.8/include/irrAllocator.h index 648c410..8a80359 100644 --- a/libraries/irrlicht-1.8/include/irrAllocator.h +++ b/libraries/irrlicht-1.8/include/irrAllocator.h @@ -1,124 +1,124 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine" and the "irrXML" project. -// For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h - -#ifndef __IRR_ALLOCATOR_H_INCLUDED__ -#define __IRR_ALLOCATOR_H_INCLUDED__ - -#include "irrTypes.h" -#include -// necessary for older compilers -#include - -namespace irr -{ -namespace core -{ - -#ifdef DEBUG_CLIENTBLOCK -#undef DEBUG_CLIENTBLOCK -#define DEBUG_CLIENTBLOCK new -#endif - -//! Very simple allocator implementation, containers using it can be used across dll boundaries -template -class irrAllocator -{ -public: - - //! Destructor - virtual ~irrAllocator() {} - - //! Allocate memory for an array of objects - T* allocate(size_t cnt) - { - return (T*)internal_new(cnt* sizeof(T)); - } - - //! Deallocate memory for an array of objects - void deallocate(T* ptr) - { - internal_delete(ptr); - } - - //! Construct an element - void construct(T* ptr, const T&e) - { - new ((void*)ptr) T(e); - } - - //! Destruct an element - void destruct(T* ptr) - { - ptr->~T(); - } - -protected: - - virtual void* internal_new(size_t cnt) - { - return operator new(cnt); - } - - virtual void internal_delete(void* ptr) - { - operator delete(ptr); - } - -}; - - -//! Fast allocator, only to be used in containers inside the same memory heap. -/** Containers using it are NOT able to be used it across dll boundaries. Use this -when using in an internal class or function or when compiled into a static lib */ -template -class irrAllocatorFast -{ -public: - - //! Allocate memory for an array of objects - T* allocate(size_t cnt) - { - return (T*)operator new(cnt* sizeof(T)); - } - - //! Deallocate memory for an array of objects - void deallocate(T* ptr) - { - operator delete(ptr); - } - - //! Construct an element - void construct(T* ptr, const T&e) - { - new ((void*)ptr) T(e); - } - - //! Destruct an element - void destruct(T* ptr) - { - ptr->~T(); - } -}; - - - -#ifdef DEBUG_CLIENTBLOCK -#undef DEBUG_CLIENTBLOCK -#define DEBUG_CLIENTBLOCK new( _CLIENT_BLOCK, __FILE__, __LINE__) -#endif - -//! defines an allocation strategy -enum eAllocStrategy -{ - ALLOC_STRATEGY_SAFE = 0, - ALLOC_STRATEGY_DOUBLE = 1, - ALLOC_STRATEGY_SQRT = 2 -}; - - -} // end namespace core -} // end namespace irr - -#endif - +// Copyright (C) 2002-2012 Nikolaus Gebhardt +// This file is part of the "Irrlicht Engine" and the "irrXML" project. +// For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h + +#ifndef __IRR_ALLOCATOR_H_INCLUDED__ +#define __IRR_ALLOCATOR_H_INCLUDED__ + +#include "irrTypes.h" +#include +// necessary for older compilers +#include + +namespace irr +{ +namespace core +{ + +#ifdef DEBUG_CLIENTBLOCK +#undef DEBUG_CLIENTBLOCK +#define DEBUG_CLIENTBLOCK new +#endif + +//! Very simple allocator implementation, containers using it can be used across dll boundaries +template +class irrAllocator +{ +public: + + //! Destructor + virtual ~irrAllocator() {} + + //! Allocate memory for an array of objects + T* allocate(size_t cnt) + { + return (T*)internal_new(cnt* sizeof(T)); + } + + //! Deallocate memory for an array of objects + void deallocate(T* ptr) + { + internal_delete(ptr); + } + + //! Construct an element + void construct(T* ptr, const T&e) + { + new ((void*)ptr) T(e); + } + + //! Destruct an element + void destruct(T* ptr) + { + ptr->~T(); + } + +protected: + + virtual void* internal_new(size_t cnt) + { + return operator new(cnt); + } + + virtual void internal_delete(void* ptr) + { + operator delete(ptr); + } + +}; + + +//! Fast allocator, only to be used in containers inside the same memory heap. +/** Containers using it are NOT able to be used it across dll boundaries. Use this +when using in an internal class or function or when compiled into a static lib */ +template +class irrAllocatorFast +{ +public: + + //! Allocate memory for an array of objects + T* allocate(size_t cnt) + { + return (T*)operator new(cnt* sizeof(T)); + } + + //! Deallocate memory for an array of objects + void deallocate(T* ptr) + { + operator delete(ptr); + } + + //! Construct an element + void construct(T* ptr, const T&e) + { + new ((void*)ptr) T(e); + } + + //! Destruct an element + void destruct(T* ptr) + { + ptr->~T(); + } +}; + + + +#ifdef DEBUG_CLIENTBLOCK +#undef DEBUG_CLIENTBLOCK +#define DEBUG_CLIENTBLOCK new( _CLIENT_BLOCK, __FILE__, __LINE__) +#endif + +//! defines an allocation strategy +enum eAllocStrategy +{ + ALLOC_STRATEGY_SAFE = 0, + ALLOC_STRATEGY_DOUBLE = 1, + ALLOC_STRATEGY_SQRT = 2 +}; + + +} // end namespace core +} // end namespace irr + +#endif + -- cgit v1.1