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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1628 - (hide annotations)
Fri Jul 11 13:12:46 2008 UTC (10 years, 9 months ago) by phornby
File MIME type: text/plain
File size: 1685 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 ksteube 1312
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 woo409 743 /**
17     \file system_dep.h
18     \ingroup Other
19     */
20     //
21     // @(#) system_dep.h
22     //
23    
24     #ifndef esysutils_system_dep_h
25     #define esysutils_system_dep_h
26    
27     #ifdef __INTEL_COMPILER
28     // The Intel compiler on windows has an "improved" math library compared to the usual Visual C++ one
29     // In particular it has a acosh and other similar functions which aren't implemented in Visual C++ math.h
30     // Note you will get a compile time error if any other header (including system ones) includes math.h whilst mathimf.h
31     // has been included. As a result system_dep.h must be included FIRST at all times (this prevents math.h from being included).
32     #include <mathimf.h>
33     #else
34     #include <math.h>
35     #endif
36    
37 woo409 779 #ifdef _WIN32
38    
39 phornby 1628 // Un-comment this block if you want it dynamic
40     // and comment out the line immediately after the block.
41     //# ifndef INTERFACE_STATIC_LIB
42     //# ifdef ESYSUTILS_EXPORTS
43     //# define ESYSUTILS_DLL_API __declspec(dllexport)
44     //# else
45     //# define ESYSUTILS_DLL_API __declspec(dllimport)
46     //# endif
47     //# endif
48     # define ESYSUTILS_DLL_API
49     # define THROW(ARG)
50     # define THROW_ANY // Stupid windows compilers complain about THROW()
51 woo409 743 #else
52 phornby 1628 # define ESYSUTILS_DLL_API
53     # define THROW(ARG) throw(ARG)
54     # define THROW_ANY throw()
55 woo409 743 #endif
56    
57    
58     #endif

  ViewVC Help
Powered by ViewVC 1.1.26