/[escript]/trunk/esysUtils/src/esys_malloc.h
ViewVC logotype

Annotation of /trunk/esysUtils/src/esys_malloc.h

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1628 - (hide annotations)
Fri Jul 11 13:12:46 2008 UTC (11 years, 2 months ago) by phornby
File MIME type: text/plain
File size: 1184 byte(s)

Merge in /branches/windows_from_1456_trunk_1620_merged_in branch.

You will find a preserved pre-merge trunk in tags under tags/trunk_at_1625.
That will be useful for diffing & checking on my stupidity.

Here is a list of the conflicts and their resolution at this
point in time.


=================================================================================
(LLWS == looks like white space).

finley/src/Assemble_addToSystemMatrix.c - resolve to branch - unused var. may be wrong.....
finley/src/CPPAdapter/SystemMatrixAdapter.cpp - resolve to branch - LLWS
finley/src/CPPAdapter/MeshAdapter.cpp - resolve to branch - LLWS
paso/src/PCG.c - resolve to branch - unused var fixes.
paso/src/SolverFCT.c - resolve to branch - LLWS
paso/src/FGMRES.c - resolve to branch - LLWS
paso/src/Common.h - resolve to trunk version. It's omp.h's include... not sure it's needed,
but for the sake of saftey.....
paso/src/Functions.c - resolve to branch version, indentation/tab removal and return error
on bad unimplemented Paso_FunctionCall.
paso/src/SolverFCT_solve.c - resolve to branch version, unused vars
paso/src/SparseMatrix_MatrixVector.c - resolve to branch version, unused vars.
escript/src/Utils.cpp - resloved to branch, needs WinSock2.h
escript/src/DataExpanded.cpp - resolved to branch version - LLWS
escript/src/DataFactory.cpp - resolve to branch version
=================================================================================

This currently passes tests on linux (debian), but is not checked on windows or Altix yet.

This checkin is to make a trunk I can check out for windows to do tests on it.

Known outstanding problem is in the operator=() method of exceptions
causing warning messages on the intel compilers.

May the God of doughnuts have mercy on my soul.


1 phornby 1587
2     /* $Id$ */
3    
4     /*******************************************************
5     *
6     * Copyright 2003-2007 by ACceSS MNRF
7     * Copyright 2007 by University of Queensland
8     *
9     * http://esscc.uq.edu.au
10     * Primary Business: Queensland, Australia
11     * Licensed under the Open Software License version 3.0
12     * http://www.opensource.org/licenses/osl-3.0.php
13     *
14     *******************************************************/
15    
16     /**
17     \file esys_malloc.h
18     \ingroup Other
19     */
20     //
21     // @(#) esys_malloc.h
22     //
23    
24     #ifndef esys_malloc_h
25     #define esys_malloc_h
26    
27     #ifdef _WIN32
28    
29     # include <python.h>
30 phornby 1612
31 phornby 1587 # define ESYS_MALLOC PyMem_Malloc
32     # define ESYS_FREE PyMem_Free
33     # define ESYS_REALLOC PyMem_Realloc
34    
35     #else
36 phornby 1612
37 phornby 1587 # include <malloc.h>
38    
39 phornby 1612 # define ESYS_MALLOC ::malloc
40     # define ESYS_FREE ::free
41     # define ESYS_REALLOC ::realloc
42    
43 phornby 1587 #endif
44    
45     namespace esysUtils
46     {
47    
48     inline
49     void *malloc(size_t len)
50     {
51     return ESYS_MALLOC(len);
52     }
53    
54     inline
55     void free(void *ptr)
56     {
57     ESYS_FREE(ptr);
58     return;
59     }
60    
61     inline
62     void *realloc(void *ptr, size_t len)
63     {
64     return ESYS_REALLOC(ptr,len);
65     }
66     }
67    
68     #undef ESYS_MALLOC
69     #undef ESYS_FREE
70     #undef ESYS_REALLOC
71    
72     #endif

  ViewVC Help
Powered by ViewVC 1.1.26