From 8e64981e54bae37e64da548bfbeb507884c5de02 Mon Sep 17 00:00:00 2001 From: AndreaRigoni Date: Fri, 7 Aug 2015 11:14:49 +0200 Subject: [PATCH] moved to constructor the accessor functions --- src/Math/DataSet.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Math/DataSet.h b/src/Math/DataSet.h index 3636d39..526b88c 100644 --- a/src/Math/DataSet.h +++ b/src/Math/DataSet.h @@ -61,16 +61,14 @@ public: template < typename F > void AddAttribute(const char *name, F f) { - ProgrammableAccessor pa(name); - pa.SetAccessFunctions(f); + ProgrammableAccessor pa(name,f); m_Accessors.push_back(pa); m_Active = &m_Accessors.back(); } template < typename F1, typename F2 > void AddAttribute(const char *name, F1 f1, F2 f2) { - ProgrammableAccessor pa(name); - pa.SetAccessFunctions(f1,f2); + ProgrammableAccessor pa(name,f1,f2); m_Accessors.push_back(pa); m_Active = &m_Accessors.back(); } @@ -86,11 +84,14 @@ public: void SetActive(const char *name) { m_Active = this->GetAttribute(name); } + uLibGetMacro(Active,ProgrammableAccessor *) uLibRefMacro(Accessors, Vector< ProgrammableAccessor >); + private: + Vector< ProgrammableAccessor > m_Accessors; - ProgrammableAccessor *m_Active; + ProgrammableAccessor *m_Active; };