/[escript]/trunk/escript/src/TransportProblemException.h
ViewVC logotype

Contents of /trunk/escript/src/TransportProblemException.h

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1628 - (show annotations)
Fri Jul 11 13:12:46 2008 UTC (11 years, 4 months ago) by phornby
File MIME type: text/plain
File size: 2369 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
2 /* $Id$ */
3
4 /*******************************************************
5 *
6 * Copyright 2007 by University of Queensland
7 *
8 * http://esscc.uq.edu.au
9 * Primary Business: Queensland, Australia
10 * Licensed under the Open Software License version 3.0
11 * http://www.opensource.org/licenses/osl-3.0.php
12 *
13 *******************************************************/
14
15 #if !defined escript_TransportProblemException_20040608_H
16 #define escript_TransportProblemException_20040608_H
17
18 #include "system_dep.h"
19 #include "esysUtils/EsysException.h"
20
21 namespace escript
22 {
23
24 /**
25 \brief
26 TransportProblemException exception class.
27
28 Description:
29 TransportProblemException exception class.
30 The class provides a public function returning the exception name
31 */
32 class TransportProblemException : public esysUtils::EsysException {
33
34 protected:
35
36 typedef EsysException Parent;
37
38 public:
39 /**
40 \brief
41 Default constructor for the exception.
42 */
43 ESCRIPT_DLL_API
44 TransportProblemException() : Parent() { updateMessage();}
45 /**
46 \brief
47 Constructor for the exception.
48 */
49 ESCRIPT_DLL_API
50 TransportProblemException(const char *cstr) :
51 Parent(cstr) { updateMessage();}
52 /**
53 \brief
54 Constructor for the exception.
55 */
56 ESCRIPT_DLL_API
57 TransportProblemException(const std::string &str) :
58 Parent(str) { updateMessage();}
59 /**
60 \brief
61 Copy Constructor for the exception.
62 */
63 ESCRIPT_DLL_API
64 TransportProblemException(const TransportProblemException &other) :
65 Parent(other)
66 {
67 updateMessage();
68 }
69
70 ESCRIPT_DLL_API
71 inline virtual TransportProblemException &
72 operator=(const TransportProblemException &other ) THROW_ANY
73 {
74 Parent::operator=(other);
75 updateMessage();
76 return *this;
77 }
78
79 /// Destructor
80 ESCRIPT_DLL_API
81 virtual ~TransportProblemException() THROW_ANY {}
82 /**
83 \brief
84 Returns the name of the exception.
85 */
86 ESCRIPT_DLL_API
87 virtual const std::string & exceptionName() const;
88
89 private:
90
91 //
92 // the exception name is immutable and class-wide.
93 // Inheritor note; you need one of these too.
94 // and an overloaded exceptionName() in your .cpp implementation file.
95 static const std::string exceptionNameValue;
96 };
97
98 } // end of namespace
99
100 #endif

Properties

Name Value
svn:eol-style native
svn:keywords Author Date Id Revision

  ViewVC Help
Powered by ViewVC 1.1.26