[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34357] trunk/blender/intern/memutil: remove unused memutil classes
Campbell Barton
ideasman42 at gmail.com
Sun Jan 16 20:55:51 CET 2011
Revision: 34357
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34357
Author: campbellbarton
Date: 2011-01-16 19:55:50 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
remove unused memutil classes
Modified Paths:
--------------
trunk/blender/intern/memutil/CMakeLists.txt
trunk/blender/intern/memutil/MEM_Allocator.h
trunk/blender/intern/memutil/MEM_CacheLimiter.h
trunk/blender/intern/memutil/MEM_CacheLimiterC-Api.h
trunk/blender/intern/memutil/MEM_RefCounted.h
trunk/blender/intern/memutil/MEM_RefCountedC-Api.h
Removed Paths:
-------------
trunk/blender/intern/memutil/MEM_NonCopyable.h
trunk/blender/intern/memutil/MEM_RefCountPtr.h
trunk/blender/intern/memutil/MEM_SmartPtr.h
Modified: trunk/blender/intern/memutil/CMakeLists.txt
===================================================================
--- trunk/blender/intern/memutil/CMakeLists.txt 2011-01-16 18:38:54 UTC (rev 34356)
+++ trunk/blender/intern/memutil/CMakeLists.txt 2011-01-16 19:55:50 UTC (rev 34357)
@@ -36,11 +36,8 @@
MEM_Allocator.h
MEM_CacheLimiter.h
MEM_CacheLimiterC-Api.h
- MEM_NonCopyable.h
- MEM_RefCountPtr.h
MEM_RefCounted.h
MEM_RefCountedC-Api.h
- MEM_SmartPtr.h
)
blender_add_lib(bf_intern_memutil "${SRC}" "${INC}")
Modified: trunk/blender/intern/memutil/MEM_Allocator.h
===================================================================
--- trunk/blender/intern/memutil/MEM_Allocator.h 2011-01-16 18:38:54 UTC (rev 34356)
+++ trunk/blender/intern/memutil/MEM_Allocator.h 2011-01-16 19:55:50 UTC (rev 34357)
@@ -21,8 +21,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef __MEM_Allocator_h_included__
-#define __MEM_Allocator_h_included__ 1
+#ifndef MEM_ALLOCATOR_H
+#define MEM_ALLOCATOR_H
#include "guardedalloc/MEM_guardedalloc.h"
#include "guardedalloc/BLO_sys_types.h"
@@ -106,4 +106,4 @@
}
};
-#endif
+#endif // MEM_ALLOCATOR_H
Modified: trunk/blender/intern/memutil/MEM_CacheLimiter.h
===================================================================
--- trunk/blender/intern/memutil/MEM_CacheLimiter.h 2011-01-16 18:38:54 UTC (rev 34356)
+++ trunk/blender/intern/memutil/MEM_CacheLimiter.h 2011-01-16 19:55:50 UTC (rev 34357)
@@ -21,8 +21,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef __MEM_cache_limiter_h_included__
-#define __MEM_cache_limiter_h_included__ 1
+#ifndef MEM_CACHELIMITER_H
+#define MEM_CACHELIMITER_H
/**
* @section MEM_CacheLimiter
@@ -164,4 +164,4 @@
MEM_Allocator<MEM_CacheLimiterHandle<T> *> > queue;
};
-#endif
+#endif // MEM_CACHELIMITER_H
Modified: trunk/blender/intern/memutil/MEM_CacheLimiterC-Api.h
===================================================================
--- trunk/blender/intern/memutil/MEM_CacheLimiterC-Api.h 2011-01-16 18:38:54 UTC (rev 34356)
+++ trunk/blender/intern/memutil/MEM_CacheLimiterC-Api.h 2011-01-16 19:55:50 UTC (rev 34357)
@@ -21,8 +21,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef __MEM_cache_limiter_c_api_h_included__
-#define __MEM_cache_limiter_c_api_h_included__ 1
+#ifndef MEM_CACHELIMITERC_API_H
+#define MEM_CACHELIMITERC_API_H
#ifdef __cplusplus
extern "C" {
@@ -37,10 +37,10 @@
/* function used to remove data from memory */
typedef void(*MEM_CacheLimiter_Destruct_Func)(void*);
-#ifndef __MEM_cache_limiter_h_included__
+#ifndef MEM_CACHELIMITER_H
extern void MEM_CacheLimiter_set_maximum(int m);
extern int MEM_CacheLimiter_get_maximum(void);
-#endif
+#endif // MEM_CACHELIMITER_H
/**
* Create new MEM_CacheLimiter object
* managed objects are destructed with the data_destructor
@@ -137,5 +137,4 @@
#endif
-#endif
-
+#endif // MEM_CACHELIMITERC_API_H
Deleted: trunk/blender/intern/memutil/MEM_NonCopyable.h
===================================================================
--- trunk/blender/intern/memutil/MEM_NonCopyable.h 2011-01-16 18:38:54 UTC (rev 34356)
+++ trunk/blender/intern/memutil/MEM_NonCopyable.h 2011-01-16 19:55:50 UTC (rev 34357)
@@ -1,58 +0,0 @@
-/**
- * $Id$
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-/**
- * @file MEM_NonCopyable.h
- * Declaration of MEM_NonCopyable class.
- */
-
-#ifndef NAN_INCLUDED_NonCopyable_h
-#define NAN_INCLUDED_NonCopyable_h
-
-/**
- * Simple class that makes sure sub classes cannot
- * generate standard copy constructors.
- * If you want to make sure that your class does
- * not have any of these cheesy hidden constructors
- * inherit from this class.
- */
-
-class MEM_NonCopyable {
-protected :
-
- MEM_NonCopyable(
- ) {
- };
-
-private :
-
- MEM_NonCopyable (const MEM_NonCopyable *);
- MEM_NonCopyable (const MEM_NonCopyable &);
-};
-
-#endif
-
Deleted: trunk/blender/intern/memutil/MEM_RefCountPtr.h
===================================================================
--- trunk/blender/intern/memutil/MEM_RefCountPtr.h 2011-01-16 18:38:54 UTC (rev 34356)
+++ trunk/blender/intern/memutil/MEM_RefCountPtr.h 2011-01-16 19:55:50 UTC (rev 34357)
@@ -1,290 +0,0 @@
-/**
- * $Id$
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-/**
- * @file MEM_RefCountPtr.h
- * Declaration of MEM_RefCounted and MEM_RefCountable classes.
- * @author Laurence
- */
-
-#ifndef NAN_INCLUDED_MEM_RefCountPtr_h
-#define NAN_INCLUDED_MEM_RefCountPtr_h
-
-#include <stdlib.h> // for NULL !
-
-/**
- * @section MEM_RefCountable
- * This is a base class for reference countable objects.
- * If you want an object to be shared using a reference
- * counted system derrivce from this class. All subclasses
- * should insist that they are created on the heap, this
- * can be done by makeing all constructors private and
- * defining a static New() method that returns a ref counted
- * ptr to a new()ly allocated instance.
- *
- * @section Example subclass
- *
- *
- * class MySharedObject : public MEM_RefCountable {
- *
- * private :
- * MySharedObject() : MEM_RefCountable() { //class specific initialization};
- * MySharedObject(const MySharedObject &other) // not implemented
- * public :
- * static
- * MEM_RefCountPtr<MySharedObject>
- * New(
- * ) {
- * return MEM_RefCountPtr<MySharedObject>( new MySharedObject());
- * }
- *
- * // other member functions
- * };
- *
- * Alternitively you may first wish to define a fully functional
- * class and then define a reference counting wrapper for this class.
- * This is useful when the base type can be used without reference
- * counting.
- *
- * E.g.
- * class UsefullClass {
- * private :
- * ...
- * public :
- *
- * UsefullClass()
- * UsefullMethod(...)
- * AnotherUsefullMethod(...)
- * };
- *
- * class RcUsefullClass : public UsefullClass, public MEM_RefCountable
- * {
- * private :
- * // Override base class public constructor --- forces
- * // use of New(...)
- * RcUsefullClass(...)
- * public :
- *
- * // Override each public constructor of UsefullClass with
- * // an equivalent static New method returning a MEM_RefCountPtr
- *
- * static
- * MEM_RefCountPtr<RcUsefullClass>
- * New(...){
- * return MEM_RefCountPtr<RcUsefullClass> output(
- * new UsefullClass(...)
- * );
- * }
- *
- * // warning never call destructor directly allow ref counting
- * // mechanism to handle object lifetime.
- * ~RcUsefullClass();
- * };
- *
- *
- */
-
-class MEM_RefCountable {
-private :
-
- /**
- * The reference count!
- * We use mutable here because we would like to
- * share references of const objects!
- * Maybe should think about having decRef()
- * another value because we should not be deleting
- * non-const objects
- */
-
- mutable int m_count;
-
-protected :
-
- /**
- * Protected constructors
- * This class is not for direct instanciation. Sub classes
- * should only be allocated on the heap.
- */
-
- MEM_RefCountable (
- ) :
- m_count (0)
- {
- };
-
- MEM_RefCountable (
- const MEM_RefCountable &
- ) :
- m_count (0)
- {
- }
-
-public :
-
- void
- IncRef(
- ) const {
- m_count++;
- }
-
- int
- DecRef(
- ) {
- return (--m_count);
- }
-
- ~MEM_RefCountable(
- ) {
- //nothing to do
- }
-};
-
-/**
- * @section MEM_RefCountPtr
- */
-
-template
- < class T >
-class MEM_RefCountPtr {
-
-public :
-
- /**
- * Construction from reference - share ownership with
- * the right hand side.
- */
-
- MEM_RefCountPtr(
- const MEM_RefCountPtr &rhs
- ) : m_val (NULL) {
- ShareOwnership(rhs.m_val);
- }
-
- /**
- * Construction from ptr - this class shares
- * ownership of object val.
- */
-
- MEM_RefCountPtr(
- const T* val
- ) :
- m_val (NULL)
- {
- ShareOwnership(val);
- }
-
- /**
- * Default constructor
- */
-
- MEM_RefCountPtr(
- ) :
- m_val (NULL)
- {
- }
-
- /**
- * Type conversion from this class to the type
- * of a pointer to the template parameter.
- * This means you can pass an instance of this class
- * to a function expecting a ptr of type T.
- */
-
- operator T * () const {
- return m_val;
- }
-
-
- MEM_RefCountPtr & operator=(
- const MEM_RefCountPtr &rhs
- ) {
- if (this->m_val != rhs.m_val) {
- ReleaseOwnership();
- ShareOwnership(rhs.m_val);
- }
- return *this;
- }
-
- /**
- * Overload the operator -> so that it's possible to access
- * all the normal methods of the internal ptr.
- */
-
- T * operator->() const {
- return m_val;
- }
-
- /**
- * Returrn a reference to the shared object.
- */
-
- T&
- Ref(
- ) {
- return *m_val;
- }
-
-
- /**
- * Destructor - deletes object if it's ref count is zero.
- */
-
- ~MEM_RefCountPtr(
- ) {
- ReleaseOwnership();
- }
-
-private :
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list