diff options
Diffstat (limited to 'project2/common/aggregate.h')
| -rw-r--r-- | project2/common/aggregate.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/project2/common/aggregate.h b/project2/common/aggregate.h index a2ad54d..90d8248 100644 --- a/project2/common/aggregate.h +++ b/project2/common/aggregate.h @@ -4,8 +4,9 @@ #include "scripts.h" #include "variables.h" #include <boost/function.hpp> +#include <visibility.h> -class Aggregate : public SourceObject { +class DLL_PUBLIC Aggregate : public SourceObject { public: Aggregate(ScriptNodePtr); @@ -17,16 +18,16 @@ class Aggregate : public SourceObject { Variable value; }; -class ValueAggregate : public Aggregate { +class DLL_PUBLIC ValueAggregate : public Aggregate { public: ValueAggregate(ScriptNodePtr); virtual VariableType resultValue() const = 0; }; typedef boost::intrusive_ptr<const ValueAggregate> ValueAggregateCPtr; -typedef AdHoc::Factory<ValueAggregate, ScriptNodePtr> ValueAggregateFactory; +typedef AdHoc::Factory<ValueAggregate, const ScriptNode *> ValueAggregateFactory; -class SetAggregate : public Aggregate { +class DLL_PUBLIC SetAggregate : public Aggregate { public: typedef boost::function1<void, VariableType> UseAgg; SetAggregate(ScriptNodePtr); @@ -34,6 +35,6 @@ class SetAggregate : public Aggregate { virtual void onResultValues(const UseAgg &) const = 0; }; typedef boost::intrusive_ptr<const SetAggregate> SetAggregateCPtr; -typedef AdHoc::Factory<SetAggregate, ScriptNodePtr> SetAggregateFactory; +typedef AdHoc::Factory<SetAggregate, const ScriptNode *> SetAggregateFactory; #endif |