[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegames/kpat/patsolve
From: Pino Toscano <pino () kde ! org>
Date: 2008-06-30 21:38:39
Message-ID: 1214861919.517721.19941.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 826526 by pino:
"allocate" is too generic to be used as macro name, especially that "allocate" is a \
member of the new_allocator class in GCC headers; thus, give it a less conflicting \
name, "mm_allocate" ("mm" as is "memory manager")
M +2 -2 memory.cpp
M +1 -1 memory.h
M +1 -1 patsolve.cpp
--- trunk/KDE/kdegames/kpat/patsolve/memory.cpp #826525:826526
@@ -93,7 +93,7 @@
/* If we didn't find it, make a new one and add it to the list. */
if (tl == NULL) {
- tl = allocate(TREELIST);
+ tl = mm_allocate(TREELIST);
if (tl == NULL) {
return NULL;
}
@@ -116,7 +116,7 @@
{
BLOCK *b;
- b = allocate(BLOCK);
+ b = mm_allocate(BLOCK);
if (b == NULL) {
return NULL;
}
--- trunk/KDE/kdegames/kpat/patsolve/memory.h #826525:826526
@@ -70,6 +70,6 @@
};
#define new_array( type, size ) ( type* )MemoryManager::allocate_memory( ( size \
)*sizeof( type ) );
-#define allocate( type ) ( type* )MemoryManager::allocate_memory( sizeof( type ) );
+#define mm_allocate( type ) ( type* )MemoryManager::allocate_memory( sizeof( type ) \
);
#endif
--- trunk/KDE/kdegames/kpat/patsolve/patsolve.cpp #826525:826526
@@ -541,7 +541,7 @@
Status = FAIL;
return -1;
}
- l = allocate(BUCKETLIST);
+ l = mm_allocate(BUCKETLIST);
if (l == NULL) {
Status = FAIL;
return -1;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic