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

Annotation of /trunk/escript/src/DataException.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: 2266 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 jgs 474
2 ksteube 1312 /* $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 jgs 82 #if !defined escript_DataException_20040324_H
17     #define escript_DataException_20040324_H
18 woo409 757 #include "system_dep.h"
19 jgs 82
20 robwdcock 682 #include "esysUtils/EsysException.h"
21 jgs 474
22 phornby 1455 namespace escript
23     {
24 jgs 82
25 phornby 1455 /**
26     \brief
27     DataException exception class.
28 jgs 82
29 phornby 1455 Description:
30     DataException exception class.
31     The class provides a public function returning the exception name
32     */
33     class DataException : public esysUtils::EsysException
34     {
35 jgs 82
36 phornby 1455 protected:
37 jgs 82
38 phornby 1455 typedef EsysException Parent;
39 phornby 1020
40 phornby 1455 public:
41     /**
42     \brief
43     Default constructor for the exception.
44     */
45     ESCRIPT_DLL_API
46     DataException() : Parent() { updateMessage();}
47     /**
48     \brief
49     Constructor for the exception.
50     */
51     ESCRIPT_DLL_API
52     DataException(const char *cstr) : Parent(cstr) { updateMessage();}
53     /**
54     \brief
55     Constructor for the exception.
56     */
57     ESCRIPT_DLL_API
58     DataException(const std::string &str) : Parent(str) { updateMessage();}
59     /**
60     \brief
61     Copy Constructor for the exception.
62     */
63     ESCRIPT_DLL_API
64     DataException(const DataException &other) : Parent(other)
65     {
66     updateMessage();
67     }
68 phornby 1020
69 phornby 1628 ESCRIPT_DLL_API
70     inline virtual DataException &
71     operator=(const DataException &other ) THROW_ANY
72     {
73     Parent::operator=(other);
74     updateMessage();
75     return *this;
76     }
77 jgs 82
78 phornby 1628
79 phornby 1455 /// Destructor
80     ESCRIPT_DLL_API
81 phornby 1628 virtual ~DataException() THROW_ANY {}
82 phornby 1455
83     /**
84     \brief
85     Returns the name of the exception.
86     */
87     ESCRIPT_DLL_API
88     virtual const std::string & exceptionName() const;
89    
90     private:
91    
92     //
93     // the exception name is immutable and class-wide.
94     // Inheritor note; you need one of these too.
95     // and an overloaded exceptionName() in your .cpp implementation file.
96     static const std::string exceptionNameValue;
97    
98    
99     };
100    
101 jgs 82 } // end of namespace
102 phornby 1455
103    
104 jgs 82 #endif

Properties

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

  ViewVC Help
Powered by ViewVC 1.1.26