# HG changeset patch # User Daniel Kraft # Date 1428492005 -7200 # Wed Apr 08 13:20:05 2015 +0200 # Node ID 40fb8a8fcb2d4d80e18ab3b21177702cabe5d6d5 # Parent b1f07d71c2c49abdee530dfc3792217aa000976c remove OCTAVE_ALLOCATOR macros * src/boundarycondition.h: Remove OCTAVE_ALLOCATOR macros. See http://hg.savannah.gnu.org/hgweb/octave/rev/76478d2da117 * src/coefficient.h, src/form.h, src/function.h, src/functionspace.h: Ditto. * src/meshfunction.h, src/mesh.h, src/subdomain.h: Ditto. diff -r b1f07d71c2c4 -r 40fb8a8fcb2d src/boundarycondition.h --- a/src/boundarycondition.h Wed Dec 10 16:11:42 2014 +0100 +++ b/src/boundarycondition.h Wed Apr 08 13:20:05 2015 +0200 @@ -76,14 +76,12 @@ std::vector > bcu; - DECLARE_OCTAVE_ALLOCATOR; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; }; static bool boundarycondition_type_loaded = false; -DEFINE_OCTAVE_ALLOCATOR (boundarycondition); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (boundarycondition, "boundarycondition", "boundarycondition"); diff -r b1f07d71c2c4 -r 40fb8a8fcb2d src/coefficient.h --- a/src/coefficient.h Wed Dec 10 16:11:42 2014 +0100 +++ b/src/coefficient.h Wed Apr 08 13:20:05 2015 +0200 @@ -62,13 +62,11 @@ std::string str; SHARED_PTR expr; - DECLARE_OCTAVE_ALLOCATOR; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; }; static bool coefficient_type_loaded = false; -DEFINE_OCTAVE_ALLOCATOR (coefficient); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (coefficient, "coefficient", "coefficient"); diff -r b1f07d71c2c4 -r 40fb8a8fcb2d src/form.h --- a/src/form.h Wed Dec 10 16:11:42 2014 +0100 +++ b/src/form.h Wed Apr 08 13:20:05 2015 +0200 @@ -64,12 +64,10 @@ SHARED_PTR frm; - DECLARE_OCTAVE_ALLOCATOR; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; }; static bool form_type_loaded = false; -DEFINE_OCTAVE_ALLOCATOR (form); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (form, "form", "form"); #endif diff -r b1f07d71c2c4 -r 40fb8a8fcb2d src/function.h --- a/src/function.h Wed Dec 10 16:11:42 2014 +0100 +++ b/src/function.h Wed Apr 08 13:20:05 2015 +0200 @@ -124,12 +124,10 @@ std::string str; SHARED_PTR fun; - DECLARE_OCTAVE_ALLOCATOR; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; }; static bool function_type_loaded = false; -DEFINE_OCTAVE_ALLOCATOR (function); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (function, "function", "function"); #endif diff -r b1f07d71c2c4 -r 40fb8a8fcb2d src/functionspace.h --- a/src/functionspace.h Wed Dec 10 16:11:42 2014 +0100 +++ b/src/functionspace.h Wed Apr 08 13:20:05 2015 +0200 @@ -64,14 +64,12 @@ SHARED_PTR fsp; - DECLARE_OCTAVE_ALLOCATOR; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; }; static bool functionspace_type_loaded = false; -DEFINE_OCTAVE_ALLOCATOR (functionspace); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (functionspace, "functionspace", "functionspace"); diff -r b1f07d71c2c4 -r 40fb8a8fcb2d src/mesh.h --- a/src/mesh.h Wed Dec 10 16:11:42 2014 +0100 +++ b/src/mesh.h Wed Apr 08 13:20:05 2015 +0200 @@ -69,12 +69,10 @@ SHARED_PTR pmsh; - DECLARE_OCTAVE_ALLOCATOR; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; }; static bool mesh_type_loaded = false; -DEFINE_OCTAVE_ALLOCATOR (mesh); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (mesh, "mesh", "mesh"); #endif diff -r b1f07d71c2c4 -r 40fb8a8fcb2d src/meshfunction.h --- a/src/meshfunction.h Wed Dec 10 16:11:42 2014 +0100 +++ b/src/meshfunction.h Wed Apr 08 13:20:05 2015 +0200 @@ -73,13 +73,11 @@ SHARED_PTR const> pmf; std::string str; - DECLARE_OCTAVE_ALLOCATOR; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; }; static bool meshfunction_type_loaded = false; -DEFINE_OCTAVE_ALLOCATOR (meshfunction); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (meshfunction, "meshfunction", "meshfunction"); #endif diff -r b1f07d71c2c4 -r 40fb8a8fcb2d src/subdomain.h --- a/src/subdomain.h Wed Dec 10 16:11:42 2014 +0100 +++ b/src/subdomain.h Wed Apr 08 13:20:05 2015 +0200 @@ -49,13 +49,11 @@ SHARED_PTR rep; - DECLARE_OCTAVE_ALLOCATOR; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; }; static bool subdomain_type_loaded = false; -DEFINE_OCTAVE_ALLOCATOR (subdomain); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (subdomain, "subdomain", "subdomain");