|
 |
da31ee5 |
--- ELPH/sources/elph.cc.chris 2007-02-09 23:29:11.000000000 +0100
|
|
|
da31ee5 |
+++ ELPH/sources/elph.cc 2007-02-09 23:29:26.000000000 +0100
|
|
|
da31ee5 |
@@ -43,7 +43,7 @@
|
|
|
da31ee5 |
default = 500\n\
|
|
|
da31ee5 |
SGFNO=n : n = no of iterations to compute significance of motif;\n\
|
|
|
da31ee5 |
default = 1000\n\
|
|
|
da31ee5 |
- "
|
|
|
da31ee5 |
+"
|
|
|
da31ee5 |
|
|
|
da31ee5 |
/* I am eliminating the following option from help file because it has no effect because I am never shuffling the file
|
|
|
da31ee5 |
-z : when using the makov chain file generation, don't exhaust\n\
|
|
|
da31ee5 |
--- ELPH/sources/GBase.h.chris 2006-09-28 19:07:25.000000000 +0200
|
|
|
da31ee5 |
+++ ELPH/sources/GBase.h 2007-02-09 23:21:52.000000000 +0100
|
|
|
da31ee5 |
@@ -61,13 +61,16 @@
|
|
|
da31ee5 |
typedef void GFreeProc(pointer item); //usually just delete,
|
|
|
da31ee5 |
//but may also support structures with embedded dynamic members
|
|
|
da31ee5 |
|
|
|
da31ee5 |
-#define GMALLOC(ptr,size) if (!GMalloc((pointer*)(&ptr),size)) \
|
|
|
da31ee5 |
- GError(ERR_ALLOC)
|
|
|
da31ee5 |
-#define GCALLOC(ptr,size) if (!GCalloc((pointer*)(&ptr),size)) \
|
|
|
da31ee5 |
- GError(ERR_ALLOC)
|
|
|
da31ee5 |
-#define GREALLOC(ptr,size) if (!GRealloc((pointer*)(&ptr),size)) \
|
|
|
da31ee5 |
- GError(ERR_ALLOC)
|
|
|
da31ee5 |
-#define GFREE(ptr) GFree((pointer*)(&ptr))
|
|
|
da31ee5 |
+#define GMALLOC(ptr,size) \
|
|
|
da31ee5 |
+ if ((ptr = static_cast<typeof(ptr)>(malloc(size))) == NULL) \
|
|
|
da31ee5 |
+ GError(ERR_ALLOC)
|
|
|
da31ee5 |
+#define GCALLOC(ptr,size) \
|
|
|
da31ee5 |
+ if ((ptr = static_cast<typeof(ptr)>(calloc(size, 1))) == NULL) \
|
|
|
da31ee5 |
+ GError(ERR_ALLOC)
|
|
|
da31ee5 |
+#define GREALLOC(ptr,size) \
|
|
|
da31ee5 |
+ if ((ptr = static_cast<typeof(ptr)>(realloc(ptr,size))) == NULL && size != 0) \
|
|
|
da31ee5 |
+ GError(ERR_ALLOC)
|
|
|
da31ee5 |
+#define GFREE(ptr) free(ptr)
|
|
|
da31ee5 |
|
|
|
da31ee5 |
|
|
|
da31ee5 |
|