Mercurial > fem-fenics-eugenio

comparison src/form.h @ 253:5e9b5bbdc56b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
20 20
21 #include <memory> 21 #include <memory>
22 #include <vector> 22 #include <vector>
23 #include <dolfin.h> 23 #include <dolfin.h>
24 #include <octave/oct.h> 24 #include <octave/oct.h>
25 #include "dolfin_compat.h"
25 26
26 class form : public octave_base_value 27 class form : public octave_base_value
27 { 28 {
28 29
29 public: 30 public:
32 : octave_base_value () {} 33 : octave_base_value () {}
33 34
34 form (const dolfin::Form _frm) 35 form (const dolfin::Form _frm)
35 : octave_base_value (), frm (new dolfin::Form (_frm)) {} 36 : octave_base_value (), frm (new dolfin::Form (_frm)) {}
36 37
37 form (boost::shared_ptr <const dolfin::Form> _frm) 38 form (SHARED_PTR <const dolfin::Form> _frm)
38 : octave_base_value (), frm (_frm) {} 39 : octave_base_value (), frm (_frm) {}
39 40
40 void 41 void
41 print (std::ostream& os, bool pr_as_read_syntax = false) const 42 print (std::ostream& os, bool pr_as_read_syntax = false) const
42 { 43 {
53 54
54 const dolfin::Form & 55 const dolfin::Form &
55 get_form (void) const 56 get_form (void) const
56 { return (*frm); } 57 { return (*frm); }
57 58
58 const boost::shared_ptr <const dolfin::Form> & 59 const SHARED_PTR <const dolfin::Form> &
59 get_pform (void) const 60 get_pform (void) const
60 { return frm; } 61 { return frm; }
61 62
62 private: 63 private:
63 64
64 boost::shared_ptr <const dolfin::Form> frm; 65 SHARED_PTR <const dolfin::Form> frm;
65 66
66 DECLARE_OCTAVE_ALLOCATOR; 67 DECLARE_OCTAVE_ALLOCATOR;
67 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; 68 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
68 69
69 }; 70 };