/[escript]/trunk/ripley/src/RipleyDomain.h
ViewVC logotype

Diff of /trunk/ripley/src/RipleyDomain.h

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

revision 4637 by sshaw, Fri Jan 24 03:29:25 2014 UTC revision 4638 by jfenwick, Thu Jan 30 06:25:10 2014 UTC
# Line 16  Line 16 
16  #ifndef __RIPLEY_DOMAIN_H__  #ifndef __RIPLEY_DOMAIN_H__
17  #define __RIPLEY_DOMAIN_H__  #define __RIPLEY_DOMAIN_H__
18    
19    #ifdef BADPYTHONMACROS
20    // This hack is required for BSD/OSX builds with python 2.7
21    // (and possibly others).  It must be the first include.
22    // From bug reports online it seems that python redefines
23    // some c macros that are functions in c++.
24    // c++ doesn't like that!
25    #include <Python.h>
26    #undef BADPYTHONMACROS
27    #endif
28    
29    
30  #include <boost/python/tuple.hpp>  #include <boost/python/tuple.hpp>
31  #include <boost/python/list.hpp>  #include <boost/python/list.hpp>
32    
# Line 32  struct Paso_SystemMatrix; Line 43  struct Paso_SystemMatrix;
43    
44  namespace ripley {  namespace ripley {
45    
46    /* There is no particular significance to this type,
47    It is here as a typedef because a bug in clang++ prevents
48    that compiler from recognising it as a valid part of
49    a constant expression.
50    */
51    typedef std::map<std::string, int> simap_t;
52    
53    
54  /**  /**
55     \brief     \brief
56     Structure that wraps parameters for the grid reading routines.     Structure that wraps parameters for the grid reading routines.

Legend:
Removed from v.4637  
changed lines
  Added in v.4638

  ViewVC Help
Powered by ViewVC 1.1.26