comparison src/coefficient.h @ 253:5e9b5bbdc56b

Support both DOLFIN 1.3.0 and 1.4.0 * src/dolfin_compat.h: use a macro to set the correct shared_ptr (std or boost)
author Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
date Tue, 29 Jul 2014 18:05:56 +0200
parents 9e944b0d0fc8
children
comparison
equal deleted inserted replaced
252:7f33554e439a 253:5e9b5bbdc56b
17 17
18 #ifndef _COEFFICIENT_OCTAVE_ 18 #ifndef _COEFFICIENT_OCTAVE_
19 #define _COEFFICIENT_OCTAVE_ 19 #define _COEFFICIENT_OCTAVE_
20 20
21 #include "expression.h" 21 #include "expression.h"
22 #include "dolfin_compat.h"
22 23
23 class coefficient : public octave_base_value 24 class coefficient : public octave_base_value
24 { 25 {
25 26
26 public: 27 public:
46 47
47 bool 48 bool
48 is_defined (void) const 49 is_defined (void) const
49 { return true; } 50 { return true; }
50 51
51 const boost::shared_ptr <const expression> & 52 const SHARED_PTR <const expression> &
52 get_expr (void) const 53 get_expr (void) const
53 { return expr; } 54 { return expr; }
54 55
55 const std::string & 56 const std::string &
56 get_str (void) const 57 get_str (void) const
57 { return str; } 58 { return str; }
58 59
59 private: 60 private:
60 61
61 std::string str; 62 std::string str;
62 boost::shared_ptr <const expression> expr; 63 SHARED_PTR <const expression> expr;
63 64
64 DECLARE_OCTAVE_ALLOCATOR; 65 DECLARE_OCTAVE_ALLOCATOR;
65 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; 66 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
66 67
67 }; 68 };