← Back to branch summary

~vcs-imports/escript-finley/trunk

« back to all changes in this revision

Viewing changes to finley/src/CPPAdapter/FinleyError.cpp

  • Committer: jfenwick
  • Date: 2010-10-11 01:48:14 UTC
  • Revision ID: svn-v4:77569008-7704-0410-b7a0-a92fef0b09fd:trunk:3259
Merging dudley and scons updates from branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
finley/src/CPPAdapter/FinleyError.cpp
12
12
*******************************************************/
13
13
 
14
14
 
15
 
#ifdef PASO_MPI
 
15
#ifdef ESYS_MPI
16
16
#include <mpi.h>
17
17
#endif
18
18
#include "FinleyError.h"
40
40
  }
41
41
  void checkPasoError() 
42
42
  {
43
 
    if (Paso_noError()) {
 
43
    if (Esys_noError()) {
44
44
      return;
45
45
    } else {
46
46
      //
47
47
      // reset the error code to no error otherwise the next call to
48
48
      // this function may resurrect a previous error
49
 
      Paso_resetError();
50
 
      throw FinleyAdapterException(Paso_getErrorMessage());
 
49
      Esys_resetError();
 
50
      throw FinleyAdapterException(Esys_getErrorMessage());
51
51
    }
52
52
  }
53
53