source: issm/oecreview/Archive/11681-11700/ISSM-11691-11692.diff@ 11991

Last change on this file since 11991 was 11991, checked in by Eric.Larour, 13 years ago

oecreview from 11518 to present
File size: 1015 bytes
RevLine 
[11991]1Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Alloc/alloc.cpp
2===================================================================
3--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Alloc/alloc.cpp (revision 11691)
4+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Alloc/alloc.cpp (revision 11692)
5@@ -66,40 +66,36 @@
6 return memptr;
7 }
8
9-void xfree( void* *pv){
10+void xfree(void* *pv){
11
12- if (pv && *pv) {
13-
14+ if (pv && *pv){
15 #ifdef _SERIAL_
16- mxFree(*pv);
17+ mxFree(*pv);
18 #else
19- free(*pv);
20+ free(*pv);
21 #endif
22
23 *pv=NULL;
24 }
25 }
26
27-void xdelete( Matrix** pv){
28-
29- if (pv && *pv) {
30-
31+void xdelete(Matrix** pv){
32+ if (pv && *pv){
33 delete *pv;
34 *pv=NULL;
35 }
36 }
37
38-void xdelete( Vector** pv){
39-
40- if (pv && *pv) {
41-
42- delete *pv;
43+void xdelete(Vector** pv){
44+ if (pv && *pv){
45+ //delete *pv;
46+ VecFree(&(*pv)->vector);
47 *pv=NULL;
48 }
49 }
50
51
52-void* xrealloc ( void* pv, int size){
53+void* xrealloc( void* pv, int size){
54
55 register void* value=NULL;
56
Note: See TracBrowser for help on using the repository browser.