bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

== Sequencer ==

Browse Source 
This fixes Bug #5299 (patch by Vladimir Marek (neuron) ), silencing
Sun CC, which is very picky in it's name mangling behaviour.
This commit is contained in:
Peter Schlaile 2007-01-18 18:22:06 +00:00
parent 6b67ba00bb
commit ebbd85de25
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/memutil/MEM_CacheLimiterC-Api.h
View File

@ -37,6 +37,9 @@ struct MEM_CacheLimiterHandle_s;
typedef struct MEM_CacheLimiter_s MEM_CacheLimiterC; typedef struct MEM_CacheLimiter_s MEM_CacheLimiterC;
typedef struct MEM_CacheLimiterHandle_s MEM_CacheLimiterHandleC; typedef struct MEM_CacheLimiterHandle_s MEM_CacheLimiterHandleC;
/* function used to remove data from memory */
typedef void(*MEM_CacheLimiter_Destruct_Func)(void*);
#ifndef __MEM_cache_limiter_h_included__ #ifndef __MEM_cache_limiter_h_included__
extern void MEM_CacheLimiter_set_maximum(int m); extern void MEM_CacheLimiter_set_maximum(int m);
extern int MEM_CacheLimiter_get_maximum(); extern int MEM_CacheLimiter_get_maximum();
@ -50,7 +53,7 @@ extern int MEM_CacheLimiter_get_maximum();
*/ */
extern MEM_CacheLimiterC * new_MEM_CacheLimiter( extern MEM_CacheLimiterC * new_MEM_CacheLimiter(
void (*data_destructor) (void * data)); MEM_CacheLimiter_Destruct_Func data_destructor);
/** /**
* Delete MEM_CacheLimiter * Delete MEM_CacheLimiter

6
intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
View File

@ -53,7 +53,7 @@ typedef std::list<MEM_CacheLimiterHandleCClass*,
class MEM_CacheLimiterCClass { class MEM_CacheLimiterCClass {
public: public:
MEM_CacheLimiterCClass(void (*data_destructor_) (void * data)) MEM_CacheLimiterCClass(MEM_CacheLimiter_Destruct_Func data_destructor_)
: data_destructor(data_destructor_) { : data_destructor(data_destructor_) {
} }
~MEM_CacheLimiterCClass(); ~MEM_CacheLimiterCClass();
@ -67,7 +67,7 @@ public:
return &cache; return &cache;
} }
private: private:
void (*data_destructor) (void * data); MEM_CacheLimiter_Destruct_Func data_destructor;
MEM_CacheLimiter<MEM_CacheLimiterHandleCClass> cache; MEM_CacheLimiter<MEM_CacheLimiterHandleCClass> cache;
@ -141,7 +141,7 @@ static inline handle_t* cast(MEM_CacheLimiterHandleC * l)
} }
MEM_CacheLimiterC * new_MEM_CacheLimiter( MEM_CacheLimiterC * new_MEM_CacheLimiter(
void (*data_destructor) (void * data)) MEM_CacheLimiter_Destruct_Func data_destructor)
{ {
return (MEM_CacheLimiterC*) new MEM_CacheLimiterCClass( return (MEM_CacheLimiterC*) new MEM_CacheLimiterCClass(
data_destructor); data_destructor);