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

Diff of /trunk/escript/src/Data.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3258 by jfenwick, Mon May 31 02:58:15 2010 UTC revision 3259 by jfenwick, Mon Oct 11 01:48:14 2010 UTC
# Line 37  extern "C" { Line 37  extern "C" {
37  #include <omp.h>  #include <omp.h>
38  #endif  #endif
39    
40  #include "esysmpi.h"  #include "esysUtils/Esys_MPI.h"
41  #include <string>  #include <string>
42  #include <algorithm>  #include <algorithm>
43  #include <sstream>  #include <sstream>
# Line 1518  instead of manually manipulating process Line 1518  instead of manually manipulating process
1518    
1519  template <class BinaryOp>  template <class BinaryOp>
1520    double    double
1521  #ifdef PASO_MPI  #ifdef ESYS_MPI
1522    lazyAlgWorker(double init, MPI_Op mpiop_type);    lazyAlgWorker(double init, MPI_Op mpiop_type);
1523  #else  #else
1524    lazyAlgWorker(double init);    lazyAlgWorker(double init);

Legend:
Removed from v.3258  
changed lines
  Added in v.3259

  ViewVC Help
Powered by ViewVC 1.1.26