Changeset 13395 for issm/trunk/src/c/shared/Alloc/alloc.h

Timestamp:

09/19/12 09:32:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13393

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/shared/Alloc/alloc.h (modified) (1 diff)

issm/trunk

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

issm/trunk/src/c/shared/Alloc/alloc.h

@@ -5 +5 @@
 #ifndef _ALLOC_H_
 #define _ALLOC_H_
-class Matrix;
-class Vector;
-void* xmalloc(int size);
-void* xcalloc(int n,int size);
-void  xfree(void** pvptr);
-void* xrealloc ( void* pv, int size);
-void xdelete(Matrix** pvptr);
-void xdelete(Vector** pvptr);
 
+#include "../../include/include.h"
+#include "./xNewDelete.h"
+
+template <class doubletype> class Matrix;
+template <class doubletype> class Vector;
+void xdelete(Matrix<IssmDouble>** pvptr);
+void xdelete(Vector<IssmDouble>** pvptr);
 #endif

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4